소스 검색

* include also regexpr test in normal regression tests

git-svn-id: trunk@48105 -
(cherry picked from commit 63c603cf32f2b80f2c5c87663faba8d1abdce56b)
florian 4 년 전
부모
커밋
6c29049923
4개의 변경된 파일5개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 0
      packages/regexpr/tests/tcregexp.pp
  2. 2 0
      packages/regexpr/tests/testregexpr.pp
  3. 1 1
      tests/Makefile
  4. 1 1
      tests/Makefile.fpc

+ 1 - 0
packages/regexpr/tests/tcregexp.pp

@@ -1,3 +1,4 @@
+{ %norun }
 unit tcregexp;
 unit tcregexp;
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}

+ 2 - 0
packages/regexpr/tests/testregexpr.pp

@@ -1,3 +1,5 @@
+{ %CONFIGFILE=fpcunit-console-defaults.ini testdefaults.ini }
+
 program testregexpr;
 program testregexpr;
 
 
 {$mode objfpc}{$H+}
 {$mode objfpc}{$H+}

+ 1 - 1
tests/Makefile

@@ -2208,7 +2208,7 @@ TESTDIRECTDIRS=
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
-TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash
+TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 ifdef QUICKTEST
 ifdef QUICKTEST
 export QUICKTEST
 export QUICKTEST

+ 1 - 1
tests/Makefile.fpc

@@ -159,7 +159,7 @@ TESTDIRECTDIRS=
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTSUBDIRS=cg cg/variants cg/cdecl cpu16 cpu16/i8086 library opt $(addprefix units/,$(TESTUNITDIRS))
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESDIRS=win-base webtbs hash fcl-registry fcl-process zlib fcl-db fcl-xml cocoaint bzip2
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
 TESTPACKAGESUBDIRS=$(addprefix packages/,$(TESTPACKAGESDIRS))
-TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash
+TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
 
 
 ifdef QUICKTEST
 ifdef QUICKTEST