udev: test - move test/ and src/test/

diff --git a/Makefile.am b/Makefile.am
index 33b51d8e30d3c2c38403f4fbdb1a5cb42688e1f5..fcc3bc6ba08f2726952bcda28666b3245fa35074 100644 (file)
--- 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
similarity index 100%
rename from src/udev/test-libudev.c
rename to src/test/test-libudev.c

diff --git a/src/udev/test-udev.c b/src/test/test-udev.c
similarity index 100%
rename from src/udev/test-udev.c
rename to src/test/test-udev.c

diff --git a/src/udev/test/.gitignore b/test/.gitignore
similarity index 100%
rename from src/udev/test/.gitignore
rename to test/.gitignore

diff --git a/src/udev/test/rule-syntax-check.py b/test/rule-syntax-check.py
similarity index 100%
rename from src/udev/test/rule-syntax-check.py
rename to test/rule-syntax-check.py

diff --git a/src/udev/test/rules-test.sh b/test/rules-test.sh
similarity index 81%
rename from src/udev/test/rules-test.sh
rename to test/rules-test.sh
index 5b3acea31fbdec91ede6e4590789229a1229fe6c..1e224ff8b59974ce562a7bb74a7f99b5c0be5871 100755 (executable)
--- 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
similarity index 100%
rename from src/udev/test/sys.tar.xz
rename to test/sys.tar.xz

diff --git a/src/udev/test/udev-test.pl b/test/udev-test.pl
similarity index 99%
rename from src/udev/test/udev-test.pl
rename to test/udev-test.pl
index a09e1b5fe2efcd0f4be17279028cf691a5c0f033..0a2571a1d500f4276bebff527bcfaf8b80494df2 100755 (executable)
--- 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";