Move regex tests to their own subdir and dont run them if regex is disabled

diff --git a/test/Makefile b/test/Makefile
index 1402c4c..98f88e6 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,6 +24,9 @@ endif
 ifneq ($(UCLIBC_HAS_FULL_RPC),y)
        DIRS := $(filter-out rpc,$(DIRS))
 endif
+ifneq ($(UCLIBC_HAS_REGEX),y)
+       DIRS := $(filter-out regex,$(DIRS))
+endif
 DIRS := $(filter-out math,$(DIRS))
 
 

diff --git a/test/misc/Makefile b/test/misc/Makefile
index fb55054..4c10e0d 100644 (file)
--- a/test/misc/Makefile
+++ b/test/misc/Makefile
@@ -6,7 +6,6 @@ TESTS_DISABLED := outb tst-fnmatch bug-glob1
 include ../Test.mak
 
 CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-CFLAGS_tst-regex2 := -std=c99
 
 DODIFF_dirent    := 1
 DODIFF_dirent64  := 1

diff --git a/test/regex/Makefile b/test/regex/Makefile
index 827d540..849b674 100644 (file)
--- a/test/regex/Makefile
+++ b/test/regex/Makefile
@@ -5,6 +5,8 @@ TESTS_DISABLED := testregexn
 
 include ../Test.mak
 
+CFLAGS_tst-regex2 := -std=c99
+
 CFLAGS-OMIT_testregex.c := -D_GNU_SOURCE
 CFLAGS-OMIT_testregexc.c := -D_GNU_SOURCE
 CFLAGS-OMIT_testregexf.c := -D_GNU_SOURCE

diff --git a/test/misc/tst-regex2.c b/test/regex/tst-regex2.c
similarity index 100%
rename from test/misc/tst-regex2.c
rename to test/regex/tst-regex2.c

diff --git a/test/misc/tst-regexloc.c b/test/regex/tst-regexloc.c
similarity index 100%
rename from test/misc/tst-regexloc.c
rename to test/regex/tst-regexloc.c