Browse Source

Consider CRLF line-endings when reading args.txt.
See #3989.

Andy Li 10 years ago
parent
commit
dfca1a31cb
2 changed files with 2 additions and 2 deletions
  1. 1 1
      tests/RunCi.hx
  2. 1 1
      tests/sys/src/TestSys.hx

+ 1 - 1
tests/RunCi.hx

@@ -433,7 +433,7 @@ class RunCi {
 	static function main():Void {
 		Sys.putEnv("OCAMLRUNPARAM", "b");
 
-		var args = File.getContent('$sysDir/args.txt').split("\n");
+		var args = ~/\r?\n/g.split(File.getContent('$sysDir/args.txt'));
 
 		var tests:Array<TEST> = switch (ci) {
 			case null:

+ 1 - 1
tests/sys/src/TestSys.hx

@@ -3,7 +3,7 @@ class TestSys extends haxe.unit.TestCase {
 	#if !interp
 	function testArgs() {
 		var args = Sys.args();
-		var expectedArgs = haxe.Resource.getString("args.txt").split("\n");
+		var expectedArgs = ~/\r?\n/g.split(haxe.Resource.getString("args.txt"));
 		// trace(args);
 		assertEquals(expectedArgs.length, args.length);
 		for (i in 0...expectedArgs.length) {