From e9d8219af147046d7a63c3a5ffcc02233bdbdf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= Date: Tue, 29 Dec 2015 15:56:29 +0100 Subject: [PATCH] fixing TestRunner for Linux --- _RebuildReleaseAndRunTests.sh | 30 ++++++++++++++++++++ bin/TestRunner.exe | Bin 26624 -> 27648 bytes bin/TestRunner.pas | 51 +++++++++++++++++----------------- 3 files changed, 56 insertions(+), 25 deletions(-) create mode 100644 _RebuildReleaseAndRunTests.sh diff --git a/_RebuildReleaseAndRunTests.sh b/_RebuildReleaseAndRunTests.sh new file mode 100644 index 000000000..39f76724c --- /dev/null +++ b/_RebuildReleaseAndRunTests.sh @@ -0,0 +1,30 @@ +#!/bin/sh +MONO_IOMAP=case xbuild pabcnetc.sln +export MONO_IOMAP=all +cd ReleaseGenerators +mono ../bin/pabcnetc.exe RebuildStandartModules.pas /rebuild +if [ $? -eq 0 ]; then + cd PABCRtl + mono ../../bin/pabcnetc.exe PABCRtl.pas /rebuild + if [ $? -eq 0 ]; then + sn -Vr PABCRtl.dll + sn -R PABCRtl.dll KeyPair.snk + sn -Vu PABCRtl.dll + cp PABCRtl.dll ../../bin/Lib + mono ../../bin/pabcnetc.exe PABCRtl32.pas /rebuild + if [ $? -eq 0 ]; then + sn -Vr PABCRtl32.dll + sn -R PABCRtl32.dll KeyPair32.snk + sn -Vu PABCRtl32.dll + cp PABCRtl32.dll ../../bin/Lib + gacutil -u PABCRtl + gacutil -i ../bin/Lib/PABCRtl.dll + mono ../bin/pabcnetc.exe RebuildStandartModules.pas /rebuild + if [ $? -eq 0 ]; then + cd ../bin + mono TestRunner.exe + cd .. + fi + fi + fi +fi \ No newline at end of file diff --git a/bin/TestRunner.exe b/bin/TestRunner.exe index 8892020680e48f344609bae0f38de2dda62055aa..ad3c645af92a349c22a5a420484d505b39399f5f 100644 GIT binary patch literal 27648 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 diff --git a/bin/TestRunner.pas b/bin/TestRunner.pas index 3db3e9e82..963d977ed 100644 --- a/bin/TestRunner.pas +++ b/bin/TestRunner.pas @@ -9,6 +9,7 @@ uses PascalABCCompiler, System.IO, System.Diagnostics; var TestSuiteDir: string; +var PathSeparator: string := Path.DirectorySeparatorChar; function GetTestSuiteDir: string; begin @@ -20,7 +21,7 @@ end; function GetLibDir: string; begin var dir := Path.GetDirectoryName(GetEXEFileName()); - Result := dir+'\Lib'; + Result := dir+PathSeparator+'Lib'; end; procedure CompileErrorTests(withide: boolean); @@ -28,12 +29,12 @@ begin var comp := new Compiler(); - var files := Directory.GetFiles(TestSuiteDir+'\errors','*.pas'); + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'errors','*.pas'); for var i := 0 to files.Length - 1 do begin var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton); co.Debug := true; - co.OutputDirectory := TestSuiteDir+'\errors'; + co.OutputDirectory := TestSuiteDir+PathSeparator+'errors'; co.UseDllForSystemUnits := false; co.RunWithEnvironment := withide; comp.ErrorsList.Clear(); @@ -64,7 +65,7 @@ begin begin var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton); co.Debug := true; - co.OutputDirectory := TestSuiteDir+'\exe'; + co.OutputDirectory := TestSuiteDir+PathSeparator+'exe'; co.UseDllForSystemUnits := withdll; co.RunWithEnvironment := false; co.IgnoreRtlErrors := false; @@ -87,12 +88,12 @@ begin var comp := new Compiler(); - var files := Directory.GetFiles(TestSuiteDir+'\'+dir,'*.pas'); + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+dir,'*.pas'); for var i := 0 to files.Length - 1 do begin var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton); co.Debug := true; - co.OutputDirectory := TestSuiteDir+'\'+dir; + co.OutputDirectory := TestSuiteDir+PathSeparator+dir; co.UseDllForSystemUnits := withdll; co.RunWithEnvironment := false; co.IgnoreRtlErrors := false; @@ -112,8 +113,8 @@ end; procedure CompileAllUnits; begin var comp := new Compiler(); - var files := Directory.GetFiles(TestSuiteDir+'\units','*.pas'); - var dir := TestSuiteDir+'\units\'; + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'units','*.pas'); + var dir := TestSuiteDir+PathSeparator+'units'+PathSeparator; for var i := 0 to files.Length - 1 do begin var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton); @@ -138,12 +139,12 @@ begin System.Environment.CurrentDirectory := Path.GetDirectoryName(GetEXEFileName()); var comp := new Compiler(); - var files := Directory.GetFiles(TestSuiteDir+'\usesunits','*.pas'); + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'usesunits','*.pas'); for var i := 0 to files.Length - 1 do begin var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton); co.Debug := true; - co.OutputDirectory := TestSuiteDir+'\exe'; + co.OutputDirectory := TestSuiteDir+PathSeparator+'exe'; co.UseDllForSystemUnits := false; comp.ErrorsList.Clear(); comp.Warnings.Clear(); @@ -160,24 +161,24 @@ end; procedure CopyPCUFiles; begin System.Environment.CurrentDirectory := Path.GetDirectoryName(GetEXEFileName()); - var files := Directory.GetFiles(TestSuiteDir+'\units','*.pcu'); + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'units','*.pcu'); foreach fname: string in files do begin - &File.Move(fname,TestSuiteDir+'\usesunits\'+Path.GetFileName(fname)); + &File.Move(fname,TestSuiteDir+PathSeparator+'usesunits'+PathSeparator+Path.GetFileName(fname)); end; end; procedure RunAllTests(redirectIO: boolean); begin - var files := Directory.GetFiles(TestSuiteDir+'\exe','*.exe'); + var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'exe','*.exe'); for var i := 0 to files.Length - 1 do begin var psi := new System.Diagnostics.ProcessStartInfo(files[i]); psi.CreateNoWindow := true; psi.UseShellExecute := false; - psi.WorkingDirectory := TestSuiteDir+'\exe'; + psi.WorkingDirectory := TestSuiteDir+PathSeparator+'exe'; {psi.RedirectStandardInput := true; psi.RedirectStandardOutput := true; psi.RedirectStandardError := true;} @@ -207,10 +208,10 @@ end; procedure RunFormatterTests; begin CodeCompletion.FormatterTester.Test(); - var errors := &File.ReadAllText(TestSuiteDir+'\formatter_tests\output\log.txt'); + var errors := &File.ReadAllText(TestSuiteDir+PathSeparator+'formatter_tests'+PathSeparator+'output'+PathSeparator+'log.txt'); if not string.IsNullOrEmpty(errors) then begin - System.Windows.Forms.MessageBox.Show(errors+System.Environment.NewLine+'more info at TestSuite\formatter_tests\output\log.txt'); + System.Windows.Forms.MessageBox.Show(errors+System.Environment.NewLine+'more info at TestSuite/formatter_tests/output/log.txt'); Halt; end; end; @@ -230,18 +231,18 @@ end; procedure ClearExeDir; begin - ClearDirByPattern(TestSuiteDir+'\exe','*.*'); - ClearDirByPattern(TestSuiteDir+'\CompilationSamples','*.exe'); - ClearDirByPattern(TestSuiteDir+'\CompilationSamples','*.pdb'); - ClearDirByPattern(TestSuiteDir+'\CompilationSamples','*.pcu'); - ClearDirByPattern(TestSuiteDir+'\pabcrtl_tests','*.exe'); - ClearDirByPattern(TestSuiteDir+'\pabcrtl_tests','*.pdb'); - ClearDirByPattern(TestSuiteDir+'\pabcrtl_tests','*.pcu'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'exe','*.*'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'CompilationSamples','*.exe'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'CompilationSamples','*.pdb'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'CompilationSamples','*.pcu'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'pabcrtl_tests','*.exe'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'pabcrtl_tests','*.pdb'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'pabcrtl_tests','*.pcu'); end; procedure DeletePCUFiles; begin - ClearDirByPattern(TestSuiteDir+'\usesunits','*.pcu'); + ClearDirByPattern(TestSuiteDir+PathSeparator+'usesunits','*.pcu'); end; procedure DeletePABCSystemPCU; @@ -255,7 +256,7 @@ begin var files := Directory.GetFiles(GetLibDir(),'*.pas'); foreach f: string in files do begin - &File.Copy(f, TestSuiteDir+'\CompilationSamples\'+Path.GetFileName(f), true); + &File.Copy(f, TestSuiteDir+PathSeparator+'CompilationSamples'+PathSeparator+Path.GetFileName(f), true); end; end;