فهرست منبع

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

Peter S. Mazinger 19 سال پیش
والد
کامیت
84f59ea0e0
5فایلهای تغییر یافته به همراه5 افزوده شده و 1 حذف شده
  1. 3 0
      test/Makefile
  2. 0 1
      test/misc/Makefile
  3. 2 0
      test/regex/Makefile
  4. 0 0
      test/regex/tst-regex2.c
  5. 0 0
      test/regex/tst-regexloc.c

+ 3 - 0
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))
 
 

+ 0 - 1
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

+ 2 - 0
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

+ 0 - 0
test/misc/tst-regex2.c → test/regex/tst-regex2.c


+ 0 - 0
test/misc/tst-regexloc.c → test/regex/tst-regexloc.c