Browse Source

Move sys test arguments to a txt file.

Andy Li 10 years ago
parent
commit
4e981066ce
4 changed files with 12 additions and 6 deletions
  1. 2 1
      tests/RunCi.hx
  2. 3 0
      tests/sys/args.txt
  3. 1 0
      tests/sys/compile-each.hxml
  4. 6 5
      tests/sys/src/TestSys.hx

+ 2 - 1
tests/RunCi.hx

@@ -433,7 +433,7 @@ class RunCi {
 	static function main():Void {
 	static function main():Void {
 		Sys.putEnv("OCAMLRUNPARAM", "b");
 		Sys.putEnv("OCAMLRUNPARAM", "b");
 
 
-		var args = ["foo", "12", "a b  %PATH% $HOME c\\&<>[\"]#{}|%$"];
+		var args = File.getContent('$sysDir/args.txt').split("\n");
 
 
 		var tests:Array<TEST> = switch (ci) {
 		var tests:Array<TEST> = switch (ci) {
 			case null:
 			case null:
@@ -478,6 +478,7 @@ class RunCi {
 
 
 					changeDirectory(sysDir);
 					changeDirectory(sysDir);
 					runCommand("haxe", ["compile-macro.hxml"]);
 					runCommand("haxe", ["compile-macro.hxml"]);
+					runCommand("haxe", ["compile-each.hxml", "--run", "Main"].concat(args));
 
 
 					//BYTECODE
 					//BYTECODE
 					switch (ci) {
 					switch (ci) {

+ 3 - 0
tests/sys/args.txt

@@ -0,0 +1,3 @@
+foo
+12
+a b  %PATH% $HOME c\&<>["]#{}|%$

+ 1 - 0
tests/sys/compile-each.hxml

@@ -1,3 +1,4 @@
 -debug
 -debug
 -cp src
 -cp src
+-resource args.txt
 -main Main
 -main Main

+ 6 - 5
tests/sys/src/TestSys.hx

@@ -3,11 +3,12 @@ class TestSys extends haxe.unit.TestCase {
 	#if !interp
 	#if !interp
 	function testArgs() {
 	function testArgs() {
 		var args = Sys.args();
 		var args = Sys.args();
-		trace(args);
-		assertEquals(3, args.length);
-		assertEquals("foo", args[0]);
-		assertEquals("12", args[1]);
-		assertEquals("a b  %PATH% $HOME c\\&<>[\"]#{}|%$", args[2]);
+		var expectedArgs = haxe.Resource.getString("args.txt").split("\n");
+		// trace(args);
+		assertEquals(expectedArgs.length, args.length);
+		for (i in 0...expectedArgs.length) {
+			assertEquals(expectedArgs[i], args[i]);
+		}
 	}
 	}
 	#end
 	#end