comment //winonly for tests (excludes test from testing in mono)

codingteam · Dec 29, 2015 · f470ba9 · f470ba9
1 parent 811ee7b
commit f470ba9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/CodeCompletion/readme.txt b/CodeCompletion/readme.txt
diff --git a/TestSuite/assemblies1.pas b/TestSuite/assemblies1.pas
@@ -1,3 +1,4 @@
+//winonly
 {$reference 'System.Windows.Forms.dll'}
 {$reference 'System.Drawing.dll'}
 {$reference 'System.Xml.dll'}

diff --git a/TestSuite/symbol_table_test.pas b/TestSuite/symbol_table_test.pas
@@ -1,3 +1,4 @@
+//winonly
 uses System, System.Windows, System.Collections, System.Collections.Generic;
 
 begin

diff --git a/bin/TestRunner.exe b/bin/TestRunner.exe
diff --git a/bin/TestRunner.pas b/bin/TestRunner.pas
@@ -11,6 +11,11 @@
 var TestSuiteDir: string;
 var PathSeparator: string := Path.DirectorySeparatorChar;
 
+function IsUnix: boolean;
+begin
+  Result := (System.Environment.OSVersion.Platform = System.PlatformID.Unix) or (System.Environment.OSVersion.Platform = System.PlatformID.MacOSX);  
+end;
+
 function GetTestSuiteDir: string;
 begin
   var dir := Path.GetDirectoryName(GetEXEFileName());
@@ -32,6 +37,9 @@ procedure CompileErrorTests(withide: boolean);
   var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'errors','*.pas');
   for var i := 0 to files.Length - 1 do
   begin
+    var content := &File.ReadAllText(files[i]);
+    if content.StartsWith('//winonly') and IsUnix then
+      continue;
     var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton);
     co.Debug := true;
     co.OutputDirectory := TestSuiteDir+PathSeparator+'errors';
@@ -63,6 +71,9 @@ procedure CompileAllRunTests(withdll: boolean; only32bit: boolean := false);
   var files := Directory.GetFiles(TestSuiteDir,'*.pas');
   for var i := 0 to files.Length - 1 do
   begin
+    var content := &File.ReadAllText(files[i]);
+    if content.StartsWith('//winonly') and IsUnix then
+      continue;
     var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton);
     co.Debug := true;
     co.OutputDirectory := TestSuiteDir+PathSeparator+'exe';
@@ -91,6 +102,9 @@ procedure CompileAllCompilationTests(dir: string; withdll: boolean);
   var files := Directory.GetFiles(TestSuiteDir+PathSeparator+dir,'*.pas');
   for var i := 0 to files.Length - 1 do
   begin
+    var content := &File.ReadAllText(files[i]);
+    if content.StartsWith('//winonly') and IsUnix then
+      continue;
     var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton);
     co.Debug := true;
     co.OutputDirectory := TestSuiteDir+PathSeparator+dir;
@@ -117,6 +131,9 @@ procedure CompileAllUnits;
   var dir := TestSuiteDir+PathSeparator+'units'+PathSeparator;
   for var i := 0 to files.Length - 1 do
   begin
+    var content := &File.ReadAllText(files[i]);
+    if content.StartsWith('//winonly') and IsUnix then
+      continue;
     var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton);
     co.Debug := true;
     co.OutputDirectory := dir;
@@ -142,6 +159,9 @@ procedure CompileAllUsesUnits;
   var files := Directory.GetFiles(TestSuiteDir+PathSeparator+'usesunits','*.pas');
   for var i := 0 to files.Length - 1 do
   begin
+    var content := &File.ReadAllText(files[i]);
+    if content.StartsWith('//winonly') and IsUnix then
+      continue;
     var co: CompilerOptions := new CompilerOptions(files[i],CompilerOptions.OutputType.ConsoleApplicaton);
     co.Debug := true;
     co.OutputDirectory := TestSuiteDir+PathSeparator+'exe';