Browse Source

lose hx-yaml dependency for now [skip ci]

Simon Krajewski 10 years ago
parent
commit
6d75afb19d
3 changed files with 38 additions and 40 deletions
  1. 3 4
      tests/README.md
  2. 34 34
      tests/RunCi.hx
  3. 1 2
      tests/RunCi.hxml

+ 3 - 4
tests/README.md

@@ -5,10 +5,9 @@ We have a number of test suites, which are placed in their own folders in this d
 "RunCi.hx" is the script used by our CIs to run all the test suites. It is possible to run it in local machines too:
 "RunCi.hx" is the script used by our CIs to run all the test suites. It is possible to run it in local machines too:
 
 
  1. Change to this directory.
  1. Change to this directory.
- 2. Install lib used by the script: `haxelib git hx-yaml https://github.com/mikestead/hx-yaml master src`.
- 3. Compile the script: `haxe RunCi.hxml`.
- 4. Define the test target by `export TEST=$TARGET` (or `set "TEST=$TARGET"` on Windows), where `$TARGET` should be one of `macro`, `neko`, `js`, `php`, `cpp`, `flash9`, `as3`, `java`, `cs`, `python`, or `third-party`. However, `flash9`, `as3`, and `third-party` are not likely to work on local machines (TODO).
- 5. Run it: `neko RunCi.n`.
+ 2. Compile the script: `haxe RunCi.hxml`.
+ 3. Define the test target by `export TEST=$TARGET` (or `set "TEST=$TARGET"` on Windows), where `$TARGET` should be one of `macro`, `neko`, `js`, `php`, `cpp`, `flash9`, `as3`, `java`, `cs`, `python`, or `third-party`. However, `flash9`, `as3`, and `third-party` are not likely to work on local machines (TODO).
+ 4. Run it: `neko RunCi.n`.
 
 
 Note that the script will try to look for test dependencies and install them if they are not found. Look at the `getXXXDependencies` functions for the details.
 Note that the script will try to look for test dependencies and install them if they are not found. Look at the `getXXXDependencies` functions for the details.
 
 

+ 34 - 34
tests/RunCi.hx

@@ -280,21 +280,21 @@ class RunCi {
 		return args;
 		return args;
 	}
 	}
 
 
-	static function parseTravisFile(path:String, ignoreBeforeInstall = false) {
-		var yaml:TravisConfig = yaml.Yaml.read(path, Parser.options().useObjects());
-		if (!ignoreBeforeInstall) {
-			for (code in yaml.before_install) {
-				var args = parseCommand(code);
-				var cmd = args.shift();
-				runCommand(cmd, args);
-			}
-		}
-		for (code in yaml.script) {
-			var args = parseCommand(code);
-			var cmd = args.shift();
-			runCommand(cmd, args);
-		}
-	}
+	//static function parseTravisFile(path:String, ignoreBeforeInstall = false) {
+		//var yaml:TravisConfig = yaml.Yaml.read(path, Parser.options().useObjects());
+		//if (!ignoreBeforeInstall) {
+			//for (code in yaml.before_install) {
+				//var args = parseCommand(code);
+				//var cmd = args.shift();
+				//runCommand(cmd, args);
+			//}
+		//}
+		//for (code in yaml.script) {
+			//var args = parseCommand(code);
+			//var cmd = args.shift();
+			//runCommand(cmd, args);
+		//}
+	//}
 
 
 	static function commandSucceed(cmd:String, args:Array<String>):Bool {
 	static function commandSucceed(cmd:String, args:Array<String>):Bool {
 		return try {
 		return try {
@@ -797,25 +797,25 @@ class RunCi {
 		runCommand("sh", ["flambe/bin/run-travis"]);
 		runCommand("sh", ["flambe/bin/run-travis"]);
 	}
 	}
 
 
-	static function testOpenflSamples() {
-		infoMsg("Test OpenFL Samples:");
-
-		changeDirectory(unitDir);
-
-		haxelibInstallGit("jgranick", "actuate");
-		haxelibInstallGit("jgranick", "box2d");
-		haxelibInstallGit("jgranick", "layout");
-		haxelibInstallGit("openfl", "swf");
-		haxelibInstallGit("openfl", "openfl-samples");
-
-		var path = getHaxelibPath("openfl-samples");
-		var old = Sys.getEnv("pwd");
-		Sys.putEnv("pwd", path);
-		parseTravisFile(haxe.io.Path.join([path, ".travis.yml"]), true);
-		if (old != null) {
-			Sys.putEnv("pwd", old);
-		}
-	}
+	//static function testOpenflSamples() {
+		//infoMsg("Test OpenFL Samples:");
+//
+		//changeDirectory(unitDir);
+//
+		//haxelibInstallGit("jgranick", "actuate");
+		//haxelibInstallGit("jgranick", "box2d");
+		//haxelibInstallGit("jgranick", "layout");
+		//haxelibInstallGit("openfl", "swf");
+		//haxelibInstallGit("openfl", "openfl-samples");
+//
+		//var path = getHaxelibPath("openfl-samples");
+		//var old = Sys.getEnv("pwd");
+		//Sys.putEnv("pwd", path);
+		//parseTravisFile(haxe.io.Path.join([path, ".travis.yml"]), true);
+		//if (old != null) {
+			//Sys.putEnv("pwd", old);
+		//}
+	//}
 
 
 	static function testFlixelDemos() {
 	static function testFlixelDemos() {
 		infoMsg("Test Flixel Demos:");
 		infoMsg("Test Flixel Demos:");

+ 1 - 2
tests/RunCi.hxml

@@ -1,3 +1,2 @@
 -neko RunCi.n
 -neko RunCi.n
--main RunCi
--lib hx-yaml
+-main RunCi