Moved unit tests into tests/unit

2012-07-03 10:53:08 +01:00
parent e817129c47
commit c0c9c6f076
16 changed files with 6 additions and 3 deletions
--- a/9
+++ b/9
@@ -10,8 +10,10 @@ DEBUG  = ENV.has_key?('DEBUG') &&
 ALL_SOURCES =FileList['src/*']
 SOURCES = ALL_SOURCES.select { |c| c =~ /\.c$/ }
 OBJECTS = SOURCES.pathmap( "%{^src,build}X.o" )
-TEST_SOURCES = FileList['tests/*.c']
-TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests,build/tests}X.o" )
+TEST_SOURCES = FileList['tests/unit/*.c']
+p TEST_SOURCES
+TEST_OBJECTS = TEST_SOURCES.pathmap( "%{^tests/unit,build/tests}X.o" )
+p TEST_OBJECTS

 LIBS    = %w( pthread )
 CCFLAGS = %w(
@@ -25,7 +27,8 @@ CCFLAGS = %w(
 LDFLAGS = []
 LIBCHECK = "/usr/lib/libcheck.a"

-TEST_MODULES = Dir["tests/check_*.c"].map { |n| n[12..-3] }
+TEST_MODULES = Dir["tests/unit/check_*.c"].map { |n|
+  File.basename( n )[%r{check_(.+)\.c},1] }

 if DEBUG
  LDFLAGS << ["-g"]
--- a/tests/unit/check_acl.c
+++ b/tests/unit/check_acl.c
--- a/tests/unit/check_bitset.c
+++ b/tests/unit/check_bitset.c
--- a/tests/unit/check_client.c
+++ b/tests/unit/check_client.c
--- a/tests/unit/check_control.c
+++ b/tests/unit/check_control.c
--- a/tests/unit/check_flexnbd.c
+++ b/tests/unit/check_flexnbd.c
--- a/tests/unit/check_ioutil.c
+++ b/tests/unit/check_ioutil.c
--- a/tests/unit/check_listen.c
+++ b/tests/unit/check_listen.c
--- a/tests/unit/check_mbox.c
+++ b/tests/unit/check_mbox.c
--- a/tests/unit/check_nbdtypes.c
+++ b/tests/unit/check_nbdtypes.c
--- a/tests/unit/check_parse.c
+++ b/tests/unit/check_parse.c
--- a/tests/unit/check_readwrite.c
+++ b/tests/unit/check_readwrite.c
--- a/tests/unit/check_self_pipe.c
+++ b/tests/unit/check_self_pipe.c
--- a/tests/unit/check_serve.c
+++ b/tests/unit/check_serve.c
--- a/tests/unit/check_status.c
+++ b/tests/unit/check_status.c
--- a/tests/unit/check_util.c
+++ b/tests/unit/check_util.c