diff options
| -rw-r--r-- | Makefile.am | 27 | ||||
| -rw-r--r-- | src/test/test-libudev.c (renamed from src/udev/test-libudev.c) | 0 | ||||
| -rw-r--r-- | src/test/test-udev.c (renamed from src/udev/test-udev.c) | 0 | ||||
| -rw-r--r-- | test/.gitignore (renamed from src/udev/test/.gitignore) | 0 | ||||
| -rwxr-xr-x | test/rule-syntax-check.py (renamed from src/udev/test/rule-syntax-check.py) | 0 | ||||
| -rwxr-xr-x | test/rules-test.sh (renamed from src/udev/test/rules-test.sh) | 2 | ||||
| -rw-r--r-- | test/sys.tar.xz (renamed from src/udev/test/sys.tar.xz) | bin | 165116 -> 165116 bytes | |||
| -rwxr-xr-x | test/udev-test.pl (renamed from src/udev/test/udev-test.pl) | 2 |
8 files changed, 16 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 33b51d8e30..fcc3bc6ba0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,7 +136,8 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/journal \ -I $(top_srcdir)/src/systemd \ -I $(top_srcdir)/src/core \ - -I $(top_srcdir)/src/libudev + -I $(top_srcdir)/src/libudev \ + -I $(top_srcdir)/src/udev AM_CFLAGS = $(WARNINGFLAGS) AM_LDFLAGS = $(GCLDFLAGS) @@ -1486,21 +1487,21 @@ udevadm_LDADD = \ # ------------------------------------------------------------------------------ TESTS += \ - src/udev/test/udev-test.pl \ - src/udev/test/rules-test.sh + test/udev-test.pl \ + test/rules-test.sh noinst_PROGRAMS += \ test-libudev \ test-udev test_libudev_SOURCES = \ - src/udev/test-libudev.c + src/test/test-libudev.c test_libudev_LDADD = \ libudev.la test_udev_SOURCES = \ - src/udev/test-udev.c + src/test/test-udev.c test_udev_LDADD = \ libudev-core.la \ @@ -1508,21 +1509,21 @@ test_udev_LDADD = \ libsystemd-shared.la check_DATA += \ - src/udev/test/sys + test/sys # packed sysfs test tree -src/udev/test/sys: - $(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz +test/sys: + $(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz test-sys-distclean: - -rm -rf src/udev/test/sys + -rm -rf test/sys DISTCLEAN_LOCAL_HOOKS += test-sys-distclean EXTRA_DIST += \ - src/udev/test/sys.tar.xz \ - src/udev/test/udev-test.pl \ - src/udev/test/rules-test.sh \ - src/udev/test/rule-syntax-check.py + test/sys.tar.xz \ + test/udev-test.pl \ + test/rules-test.sh \ + test/rule-syntax-check.py # ------------------------------------------------------------------------------ ata_id_SOURCES = \ diff --git a/src/udev/test-libudev.c b/src/test/test-libudev.c index 6161fb3e31..6161fb3e31 100644 --- a/src/udev/test-libudev.c +++ b/src/test/test-libudev.c diff --git a/src/udev/test-udev.c b/src/test/test-udev.c index 150cb16a31..150cb16a31 100644 --- a/src/udev/test-udev.c +++ b/src/test/test-udev.c diff --git a/src/udev/test/.gitignore b/test/.gitignore index 98fa886530..98fa886530 100644 --- a/src/udev/test/.gitignore +++ b/test/.gitignore diff --git a/src/udev/test/rule-syntax-check.py b/test/rule-syntax-check.py index 4fa3042d4f..4fa3042d4f 100755 --- a/src/udev/test/rule-syntax-check.py +++ b/test/rule-syntax-check.py diff --git a/src/udev/test/rules-test.sh b/test/rules-test.sh index 5b3acea31f..1e224ff8b5 100755 --- a/src/udev/test/rules-test.sh +++ b/test/rules-test.sh @@ -12,4 +12,4 @@ type python >/dev/null 2>&1 || { exit 0 } -$srcdir/src/udev/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'` +$srcdir/test/rule-syntax-check.py `find $srcdir/rules -name '*.rules'` diff --git a/src/udev/test/sys.tar.xz b/test/sys.tar.xz Binary files differindex 49ee8027b2..49ee8027b2 100644 --- a/src/udev/test/sys.tar.xz +++ b/test/sys.tar.xz diff --git a/src/udev/test/udev-test.pl b/test/udev-test.pl index a09e1b5fe2..0a2571a1d5 100755 --- a/src/udev/test/udev-test.pl +++ b/test/udev-test.pl @@ -21,7 +21,7 @@ use warnings; use strict; my $PWD = $ENV{PWD}; -my $sysfs = "src/udev/test/sys"; +my $sysfs = "test/sys"; my $udev_bin = "./test-udev"; my $valgrind = 0; my $udev_bin_valgrind = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin"; |