colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-28 19:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update test task.

Browse Source
This commit is contained in:
Tom Robinson committed 2009-11-02 15:31:14 -08:00
1 parent ea8245a6b3
commit 8fddc2370b
2 files changed
+9 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Jakefile
+8 -13
View File
@@ -7,7 +7,7 @@ var FILE = require("file"),
require(FILE.absolute("common.jake"));
var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools", "External/ojunit"];
var subprojects = ["Objective-J", "CommonJS", "Foundation", "AppKit", "Tools"];
["build", "clean", "clobber"].forEach(function(aTaskName)
{
@@ -154,16 +154,11 @@ task ("deploy", ["downloads"], function()
task ("test", ["build"], function()
{
var tests = "'" + FileList('Tests/**/*.j').join("' '") + "'",
build_result = OS.system("ojtest " + tests);
if (build_result.match(/Test suite failed/i))
{
print("tests failed, aborting the build");
print (build_result);
OS.exit(1);
}
else
print(build_result);
var tests = new FileList('Tests/**/*Test.j');
var cmd = ["ojtest"].concat(tests.items());
var cmdString = cmd.map(OS.enquote).join(" ");
var code = OS.system(cmdString);
if (code !== 0)
OS.exit(code);
});
Objective-J/CommonJS/lib/objective-j.js
+1 -1
View File
@@ -15,7 +15,7 @@ window.OBJJ_HOME = exports.OBJJ_HOME = FILE.resolve(module.path, "..");
var frameworksPath = FILE.resolve(window.OBJJ_HOME, "Frameworks/"),
objectivejPath = FILE.resolve(frameworksPath, "Objective-J/", "CommonJS.platform/", "Objective-J.js");
window.OBJJ_INCLUDE_PATHS = [frameworksPath];
window.OBJJ_INCLUDE_PATHS = exports.OBJJ_INCLUDE_PATHS = [frameworksPath];
// Find all narwhal packages with Objective-J frameworks.