소스 검색

TravisCI: fix flash builds

Andy Li 11 년 전
부모
커밋
d5701183ac
1개의 변경된 파일10개의 추가작업 그리고 13개의 파일을 삭제
  1. 10 13
      tests/RunTravis.hx

+ 10 - 13
tests/RunTravis.hx

@@ -21,26 +21,23 @@ class RunTravis {
 		Sys.putEnv("AUDIODEV", "null");
 		runCommand("sudo", ["apt-get", "install", "-qq", "libgd2-xpm", "ia32-libs", "ia32-libs-multiarch", "-y"]);
 		runCommand("wget", ["-nv", "http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_sa_debug.i386.tar.gz"]);
-		runCommand("tar", ["-xf", "flashplayer_11_sa_debug.i386.tar.gz"]);
+		runCommand("tar", ["-xf", "flashplayer_11_sa_debug.i386.tar.gz", "-C", Sys.getEnv("HOME")]);
 		File.saveContent(Sys.getEnv("HOME") + "/mm.cfg", "ErrorReportingEnable=1\nTraceOutputFileEnable=1");
-		runCommand("./flashplayerdebugger", ["-v"]);
+		runCommand(Sys.getEnv("HOME") + "/flashplayerdebugger", ["-v"]);
 	}
 
-	static function runFlash(flashplayerdebuggerProcess:Process):Void {
+	static function runFlash(swf:String):Void {
+		Sys.command(Sys.getEnv("HOME") + "/flashplayerdebugger", [swf, "&"]);
+
 		//wait a little until flashlog.txt is created
 		var flashlogPath = Sys.getEnv("HOME") + "/.macromedia/Flash_Player/Logs/flashlog.txt";
 		for (t in 0...5) {
 			runCommand("sleep", ["2"]);
 			if (FileSystem.exists(flashlogPath))
 				break;				
-		}				
+		}
 		if (!FileSystem.exists(flashlogPath)) {
-			//the flashplayerdebugger should has already exited with some error...
-			Sys.println(flashplayerdebuggerProcess.stdout.readAll().toString());
-			Sys.println(flashplayerdebuggerProcess.stderr.readAll().toString());
-
-			var exitCode = flashplayerdebuggerProcess.exitCode();
-			Sys.println('flashplayerdebuggerProcess exited with $exitCode');
+			Sys.println('$flashlogPath not found.');
 			Sys.exit(1);
 		}
 
@@ -110,11 +107,11 @@ class RunTravis {
 			case "flash9":
 				setupFlashPlayerDebugger();
 				runCommand("haxe", ["compile-flash9.hxml", "-D", "fdb"]);
-				runFlash(new Process("./flashplayerdebugger", ["unit9.swf"]));
+				runFlash("unit9.swf");
 			case "flash8":
 				setupFlashPlayerDebugger();
 				runCommand("haxe", ["compile-flash8.hxml", "-D", "fdb"]);
-				runFlash(new Process("./flashplayerdebugger", ["unit8.swf"]));
+				runFlash("unit8.swf");
 			case "as3":
 				setupFlashPlayerDebugger();
 
@@ -130,7 +127,7 @@ class RunTravis {
 				runCommand("mxmlc", ["--version"]);
 
 				runCommand("haxe", ["compile-as3.hxml", "-D", "fdb"]);
-				runFlash(new Process("./flashplayerdebugger", ["unit9_as3.swf"]));
+				runFlash("unit9_as3.swf");
 			case target:
 				throw "unknown target: " + target;
 		}