paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-14 05:40:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Include packages/fcl-registry/tests to be run by the testsuite. Renamed files so only the main test files start with "t".

Browse Source 
git-svn-id: trunk@48382 -
This commit is contained in:
yury 2021-01-24 11:01:33 +00:00
parent 67a3af29a0
commit ddf0ce014b
9 changed files with 149 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@ -3970,9 +3970,9 @@ packages/fcl-registry/src/xmlreg.pp svneol=native#text/plain
packages/fcl-registry/src/xregreg.inc svneol=native#text/plain
packages/fcl-registry/tests/Makefile svneol=native#text/plain
packages/fcl-registry/tests/Makefile.fpc -text
packages/fcl-registry/tests/regtestframework.pp -text
packages/fcl-registry/tests/tcxmlreg.pp svneol=native#text/plain
packages/fcl-registry/tests/testbasics.pp svneol=native#text/plain
packages/fcl-registry/tests/regtcxmlreg.pp svneol=native#text/plain
packages/fcl-registry/tests/regtestbasics.pp svneol=native#text/plain
packages/fcl-registry/tests/tregtestframework.pp svneol=native#text/plain
packages/fcl-report/Makefile svneol=native#text/plain
packages/fcl-report/Makefile.fpc svneol=native#text/plain
packages/fcl-report/demos/company-logo.png -text svneol=unset#image/png

3
packages/fcl-registry/fpmake.pp
View File

@ -46,8 +46,7 @@ begin
T:=P.Targets.AddUnit('xmlreg.pp');
P.ExamplePath.Add('examples');
P.Targets.AddExampleProgram('tests/testbasics.pp');
P.Targets.AddExampleProgram('tests/regtestframework.pp');
P.Targets.AddExampleProgram('tests/tregtestframework.pp');
// 'tests/Makefile
// 'tests/Makefile.fpc

208
packages/fcl-registry/tests/Makefile
View File

@ -350,316 +350,316 @@ endif
override PACKAGE_NAME=fcl
PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-os2)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-netware)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-emx)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i386-aros)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-macosclassic)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),m68k-sinclairql)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-macosclassic)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-wii)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc-aix)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-haiku)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-openbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-iphonesim)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-aros)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),x86_64-dragonfly)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-netbsd)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-nds)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-aros)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-freertos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),arm-ios)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),powerpc64-aix)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),mips-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),mipsel-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),mipsel-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),mips64el-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),jvm-java)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),jvm-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i8086-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i8086-msdos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),i8086-win16)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),aarch64-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),aarch64-darwin)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),aarch64-win64)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),aarch64-android)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),aarch64-ios)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),wasm-wasm)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),sparc64-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),riscv32-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),riscv32-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),riscv64-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),riscv64-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),xtensa-linux)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),xtensa-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),xtensa-freertos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),z80-embedded)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),z80-zxspectrum)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),z80-msxdos)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
ifeq ($(FULL_TARGET),z80-amstradcpc)
override TARGET_EXAMPLES+=regtestframework
override TARGET_EXAMPLES+=tregtestframework
endif
override INSTALL_FPCPACKAGE=y
ifdef REQUIRE_UNITSDIR

4
packages/fcl-registry/tests/Makefile.fpc
View File

@ -1,12 +1,12 @@
#
# Makefile.fpc for DB TestFramework
# Makefile.fpc for Registry TestFramework
#
[package]
main=fcl
[target]
examples=regtestframework
examples=tregtestframework
[install]
fpcpackage=y

2
packages/fcl-registry/tests/tcxmlreg.pp → packages/fcl-registry/tests/regtcxmlreg.pp
View File

@ -1,4 +1,4 @@
unit tcxmlreg;
unit regtcxmlreg;
{$mode objfpc}{$H+}

2
packages/fcl-registry/tests/testbasics.pp → packages/fcl-registry/tests/regtestbasics.pp
View File

@ -1,4 +1,4 @@
unit TestBasics;
unit RegTestBasics;
{$IFDEF FPC}
{$mode objfpc}{$H+}

69
packages/fcl-registry/tests/regtestframework.pp → packages/fcl-registry/tests/tregtestframework.pp
View File

@ -1,34 +1,35 @@
program regtestframework;
{$IFDEF FPC}
{$mode objfpc}{$H+}
{$ENDIF}
{$IFDEF WINDOWS}
{$APPTYPE CONSOLE}
{$ENDIF}
uses
{$ifdef unix}
cwstring,
{$endif}
SysUtils,
fpcunit, testreport, testregistry, consoletestrunner,
// Units wich contains the tests
tcxmlreg,
testbasics;
Var
A : TTestRunner;
begin
DefaultFormat:=fPlain;
DefaultRunAllTests:=True;
A:=TTestRunner.Create(Nil);
try
A.Initialize;
A.Run;
finally
A.Free;
end;
end.
{ %TARGET=win32,win64,wince,linux,solaris, }
program tregtestframework;
{$IFDEF FPC}
{$mode objfpc}{$H+}
{$ENDIF}
{$IFDEF WINDOWS}
{$APPTYPE CONSOLE}
{$ENDIF}
uses
{$ifdef unix}
cwstring,
{$endif}
SysUtils,
fpcunit, testreport, testregistry, consoletestrunner,
// Units wich contains the tests
regtcxmlreg,
regtestbasics;
Var
A : TTestRunner;
begin
DefaultFormat:=fPlain;
DefaultRunAllTests:=True;
A:=TTestRunner.Create(Nil);
try
A.Initialize;
A.Run;
finally
A.Free;
end;
end.

2
tests/Makefile
View File

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

2
tests/Makefile.fpc
View File

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