paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 12:49:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

* include fcl-json in regression tests

Browse Source 
* switch extension to .pas for files which shall be ignored
    by the regression tests (they are found by the compiler automatically)

(cherry picked from commit 2efaee6d85)
This commit is contained in:
florian 2021-08-16 20:17:27 +02:00
parent 2e7736064e
commit fa9822b8a5
12 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
packages/fcl-json/tests/jsonconftest.pp → packages/fcl-json/tests/jsonconftest.pas
View File

0
packages/fcl-json/tests/tcjsonini.pp → packages/fcl-json/tests/tcjsonini.pas
View File

0
packages/fcl-json/tests/tcjsontocode.pp → packages/fcl-json/tests/tcjsontocode.pas
View File

0
packages/fcl-json/tests/testcomps.pp → packages/fcl-json/tests/testcomps.pas
View File

10
packages/fcl-json/tests/testjson.lpi
View File

@ -41,23 +41,23 @@
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="testjsonparser.pp"/> <Filename Value="testjsonparser.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit1> </Unit1>
<Unit2> <Unit2>
<Filename Value="testjsondata.pp"/> <Filename Value="testjsondata.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit2> </Unit2>
<Unit3> <Unit3>
<Filename Value="testjsonrtti.pp"/> <Filename Value="testjsonrtti.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit3> </Unit3>
<Unit4> <Unit4>
<Filename Value="../src/fpjsonrtti.pp"/> <Filename Value="../src/fpjsonrtti.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="testjsonreader.pp"/> <Filename Value="testjsonreader.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
</Unit5> </Unit5>
</Units> </Units>

0
packages/fcl-json/tests/testjsonconf.pp → packages/fcl-json/tests/testjsonconf.pas
View File

0
packages/fcl-json/tests/testjsondata.pp → packages/fcl-json/tests/testjsondata.pas
View File

0
packages/fcl-json/tests/testjsonparser.pp → packages/fcl-json/tests/testjsonparser.pas
View File

0
packages/fcl-json/tests/testjsonreader.pp → packages/fcl-json/tests/testjsonreader.pas
View File

0
packages/fcl-json/tests/testjsonrtti.pp → packages/fcl-json/tests/testjsonrtti.pas
View File

2
tests/Makefile
View File

@ -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 regexpr fcl-registry fcl-passrc TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc fcl-json
TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS))) TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
ifdef QUICKTEST ifdef QUICKTEST
export QUICKTEST export QUICKTEST

2
tests/Makefile.fpc
View File

@ -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 regexpr fcl-registry fcl-passrc TESTPACKAGESDIRECTDIRS=rtl-objpas rtl-generics hash regexpr fcl-registry fcl-passrc fcl-json
TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS))) TESTPACKAGESDIRECTSUBDIRS=$(addprefix ../packages/,$(addsuffix /tests,$(TESTPACKAGESDIRECTDIRS)))
ifdef QUICKTEST ifdef QUICKTEST