Skip to content

Commit c1f45ff

Browse files
mfikesdnolen
authored and
dnolen
committed
CLJS-1624: Avoid the use of JSC_HOME for tests
Don't make use of JSC_HOME because it triggers a warning in command-line apps that make use of JavaScriptCore owing to http://trac.webkit.org/changeset/194606 Instead, we can simply check to see if jsc is on the path.
1 parent 29eb8e0 commit c1f45ff

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

script/benchmark

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ else
1919
"${SPIDERMONKEY_HOME}/js" -f builds/out-adv-bench/core-advanced-benchmark.js
2020
fi
2121

22-
if [ "$JSC_HOME" = "" ]; then
23-
echo "JSC_HOME not set, skipping JavaScriptCore benchmarks"
22+
if ! hash jsc 2>/dev/null; then
23+
echo "jsc not on path, skipping JavaScriptCore benchmarks"
2424
else
2525
echo "Benchmarking with JavaScriptCore"
26-
"${JSC_HOME}/jsc" -f builds/out-adv-bench/core-advanced-benchmark.js
26+
jsc -f builds/out-adv-bench/core-advanced-benchmark.js
2727
fi
2828

2929
if [ "$NASHORN_HOME" = "" ]; then

script/test

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ else
2626
ran=$((ran+1))
2727
fi
2828

29-
if [ "$JSC_HOME" = "" ]; then
30-
echo "JSC_HOME not set, skipping JavaScriptCore tests"
29+
if ! hash jsc 2>/dev/null; then
30+
echo "jsc not on path, skipping JavaScriptCore tests"
3131
else
3232
echo "Testing with JavaScriptCore"
33-
"${JSC_HOME}/jsc" -f builds/out-adv/core-advanced-test.js
33+
jsc -f builds/out-adv/core-advanced-test.js
3434
ran=$((ran+1))
3535
fi
3636

script/test-simple

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ else
2727
fi
2828

2929
# commented out because of memory issue in JSC w/ nested fn calls - David
30-
#if [ "$JSC_HOME" = "" ]; then
31-
# echo "JSC_HOME not set, skipping JavaScriptCore tests"
30+
#if ! hash jsc 2>/dev/null; then
31+
# echo "jsc not on path, skipping JavaScriptCore tests"
3232
#else
3333
# echo "Testing with JavaScriptCore"
34-
# "${JSC_HOME}/jsc" -f builds/out-simp/core-simple-test.js
34+
# jsc -f builds/out-simp/core-simple-test.js
3535
# ran=$[ran+1]
3636
#fi
3737

0 commit comments

Comments
 (0)