summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonny Chevalier <chevalier.ronny@gmail.com>2016-03-03 00:31:23 +0100
committerRonny Chevalier <chevalier.ronny@gmail.com>2016-03-03 19:04:07 +0100
commit6a4f4a0fa016a28bf0161d46034d2dc875c0f38f (patch)
tree0a9f85f39ddcd86f2233fcca4ed13d97d7f8f4b4
parentac933e8ec4eda7ba1fa387fce7bebdb3d4390b30 (diff)
tests: move glob-util related tests to test-glob-util.c
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am7
-rw-r--r--src/test/test-glob-util.c50
-rw-r--r--src/test/test-util.c20
4 files changed, 58 insertions, 20 deletions
diff --git a/.gitignore b/.gitignore
index a17cbad004..41162ab553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,6 +193,7 @@
/test-firewall-util
/test-fs-util
/test-fstab-util
+/test-glob-util
/test-hashmap
/test-hexdecoct
/test-hostname
diff --git a/Makefile.am b/Makefile.am
index 1b06ffb98c..5e536dd9a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1432,6 +1432,7 @@ tests += \
test-alloc-util \
test-proc-cmdline \
test-io-util \
+ test-glob-util \
test-fs-util \
test-web-util \
test-stat-util \
@@ -1783,6 +1784,12 @@ test_io_util_SOURCES = \
test_io_util_LDADD = \
libbasic.la
+test_glob_util_SOURCES = \
+ src/test/test-glob-util.c
+
+test_glob_util_LDADD = \
+ libbasic.la
+
test_fs_util_SOURCES = \
src/test/test-fs-util.c
diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
new file mode 100644
index 0000000000..227d4290f0
--- /dev/null
+++ b/src/test/test-glob-util.c
@@ -0,0 +1,50 @@
+/***
+ 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 <fcntl.h>
+#include <unistd.h>
+
+#include "alloc-util.h"
+#include "fileio.h"
+#include "glob-util.h"
+#include "macro.h"
+
+static void test_glob_exists(void) {
+ char name[] = "/tmp/test-glob_exists.XXXXXX";
+ int fd = -1;
+ int r;
+
+ fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
+ assert_se(fd >= 0);
+ close(fd);
+
+ r = glob_exists("/tmp/test-glob_exists*");
+ assert_se(r == 1);
+
+ r = unlink(name);
+ assert_se(r == 0);
+ r = glob_exists("/tmp/test-glob_exists*");
+ assert_se(r == 0);
+}
+
+int main(void) {
+ test_glob_exists();
+
+ return 0;
+}
diff --git a/src/test/test-util.c b/src/test/test-util.c
index 4eb17e47e5..3d876ab5e5 100644
--- a/src/test/test-util.c
+++ b/src/test/test-util.c
@@ -31,7 +31,6 @@
#include "fd-util.h"
#include "fileio.h"
#include "fs-util.h"
-#include "glob-util.h"
#include "mkdir.h"
#include "parse-util.h"
#include "path-util.h"
@@ -207,24 +206,6 @@ static void test_log2i(void) {
assert_se(log2i(INT_MAX) == sizeof(int)*8-2);
}
-static void test_glob_exists(void) {
- char name[] = "/tmp/test-glob_exists.XXXXXX";
- int fd = -1;
- int r;
-
- fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC);
- assert_se(fd >= 0);
- close(fd);
-
- r = glob_exists("/tmp/test-glob_exists*");
- assert_se(r == 1);
-
- r = unlink(name);
- assert_se(r == 0);
- r = glob_exists("/tmp/test-glob_exists*");
- assert_se(r == 0);
-}
-
static void test_execute_directory(void) {
char template_lo[] = "/tmp/test-readlink_and_make_absolute-lo.XXXXXXX";
char template_hi[] = "/tmp/test-readlink_and_make_absolute-hi.XXXXXXX";
@@ -338,7 +319,6 @@ int main(int argc, char *argv[]) {
test_protect_errno();
test_in_set();
test_log2i();
- test_glob_exists();
test_execute_directory();
test_raw_clone();
test_fgetxattrat_fake();