summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am7
-rw-r--r--src/test/test-util.c14
-rw-r--r--src/test/test-web-util.c39
4 files changed, 47 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 224c24635c..40685305ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -276,6 +276,7 @@
/test-util
/test-verbs
/test-watchdog
+/test-web-util
/test-xml
/timedatectl
/udevadm
diff --git a/Makefile.am b/Makefile.am
index 11043d41b8..7956264fb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1429,6 +1429,7 @@ tests += \
test-hexdecoct \
test-escape \
test-alloc-util \
+ test-web-util \
test-string-util \
test-extract-word \
test-parse-util \
@@ -1770,6 +1771,12 @@ test_alloc_util_SOURCES = \
test_alloc_util_LDADD = \
libbasic.la
+test_web_util_SOURCES = \
+ src/test/test-web-util.c
+
+test_web_util_LDADD = \
+ libbasic.la
+
test_escape_SOURCES = \
src/test/test-escape.c
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 901898c29c..cd32892558 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -51,7 +51,6 @@
#include "user-util.h"
#include "util.h"
#include "virt.h"
-#include "web-util.h"
#include "xattr-util.h"
static void test_align_power2(void) {
@@ -481,18 +480,6 @@ static void test_files_same(void) {
unlink(name_alias);
}
-static void test_is_valid_documentation_url(void) {
- assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd"));
- assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/binfmt_misc.txt"));
- assert_se(documentation_url_is_valid("file:/foo/foo"));
- assert_se(documentation_url_is_valid("man:systemd.special(7)"));
- assert_se(documentation_url_is_valid("info:bar"));
-
- assert_se(!documentation_url_is_valid("foo:"));
- assert_se(!documentation_url_is_valid("info:"));
- assert_se(!documentation_url_is_valid(""));
-}
-
static void test_file_in_same_dir(void) {
char *t;
@@ -942,7 +929,6 @@ int main(int argc, char *argv[]) {
test_log2i();
test_filename_is_valid();
test_files_same();
- test_is_valid_documentation_url();
test_file_in_same_dir();
test_close_nointr();
test_unlink_noerrno();
diff --git a/src/test/test-web-util.c b/src/test/test-web-util.c
new file mode 100644
index 0000000000..79a3a13af6
--- /dev/null
+++ b/src/test/test-web-util.c
@@ -0,0 +1,39 @@
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
+#include "macro.h"
+#include "web-util.h"
+
+static void test_is_valid_documentation_url(void) {
+ assert_se(documentation_url_is_valid("http://www.freedesktop.org/wiki/Software/systemd"));
+ assert_se(documentation_url_is_valid("https://www.kernel.org/doc/Documentation/binfmt_misc.txt"));
+ assert_se(documentation_url_is_valid("file:/foo/foo"));
+ assert_se(documentation_url_is_valid("man:systemd.special(7)"));
+ assert_se(documentation_url_is_valid("info:bar"));
+
+ assert_se(!documentation_url_is_valid("foo:"));
+ assert_se(!documentation_url_is_valid("info:"));
+ assert_se(!documentation_url_is_valid(""));
+}
+
+int main(int argc, char *argv[]) {
+ test_is_valid_documentation_url();
+
+ return 0;
+}