summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-03-01 20:39:48 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-03-01 20:39:48 +0000
commit84f59ea0e020deb280dc1bced08ee8aa8176292f (patch)
tree5361f21f064296f9c43cfdd8d787218f6b05bf84
parent2688d30ffbe025d026f426b0e4976f2fb50f1606 (diff)
Move regex tests to their own subdir and dont run them if regex is disabled
-rw-r--r--test/Makefile3
-rw-r--r--test/misc/Makefile1
-rw-r--r--test/regex/Makefile2
-rw-r--r--test/regex/tst-regex2.c (renamed from test/misc/tst-regex2.c)0
-rw-r--r--test/regex/tst-regexloc.c (renamed from test/misc/tst-regexloc.c)0
5 files changed, 5 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile
index 1402c4ca9..98f88e66c 100644
--- 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 fb55054eb..4c10e0dfa 100644
--- 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 827d54041..849b674e8 100644
--- 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
index 94be59d85..94be59d85 100644
--- a/test/misc/tst-regex2.c
+++ b/test/regex/tst-regex2.c
diff --git a/test/misc/tst-regexloc.c b/test/regex/tst-regexloc.c
index 034fee706..034fee706 100644
--- a/test/misc/tst-regexloc.c
+++ b/test/regex/tst-regexloc.c