Merge pull request #2650 from andyli/travis

TravisCI: Fixed SauceLabs and cpp

tests/RunTravis.hx

@@ -78,12 +78,18 @@ class RunTravis {
 
 				//install and build hxcpp
 				runCommand("haxelib", ["git", "hxcpp", "https://github.com/HaxeFoundation/hxcpp.git"]);
-				Sys.setCwd(Sys.getEnv("HOME") + "/haxelib/hxcpp/git/runtime/");
-				runCommand("haxelib", ["run", "hxcpp", "BuildLibs.xml"]);
+				Sys.setCwd(Sys.getEnv("HOME") + "/haxelib/hxcpp/git/project/");
+				runCommand("haxelib", ["run", "hxcpp", "Build.xml"]);
+				runCommand("haxelib", ["run", "hxcpp", "Build.xml", "-DHXCPP_M64"]);
 				Sys.setCwd(unitDir);
 				
 				runCommand("haxe", ["compile-cpp.hxml"]);
 				runCommand("./cpp/Test-debug", []);
+
+				runCommand("rm", ["-rf", "cpp"]);
+				
+				runCommand("haxe", ["compile-cpp.hxml", "-D", "HXCPP_M64"]);
+				runCommand("./cpp/Test-debug", []);
 			case "js":
 				runCommand("haxe", ["compile-js.hxml"]);
 				runCommand("node", ["-e", "var unit = require('./unit.js').unit; unit.Test.main(); process.exit(unit.Test.success ? 0 : 1);"]);
@@ -91,7 +97,7 @@ class RunTravis {
 				if (Sys.getEnv("TRAVIS_SECURE_ENV_VARS") == "true") {
 					//https://saucelabs.com/opensource/travis
 					runCommand("npm", ["install", "wd"]);
-					runCommand("curl", ["https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh", "|", "bash"]);
+					runCommand("curl", ["https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh", "-L", "|", "bash"]);
 					runCommand("haxelib", ["install", "nodejs"]);
 					runCommand("haxe", ["compile-saucelabs-runner.hxml"]);
 					runCommand("nekotools", ["server", "&"]);