projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-16046 - Move karma.conf.js to default location
[civicrm-core.git]
/
tools
/
scripts
/
npm
/
test.sh
diff --git
a/tools/scripts/npm/test.sh
b/tools/scripts/npm/test.sh
index 40ac68bcf48461ed00e3ffb43db53266771f159a..8cf25ba2a29d274a2485ed22b531e5faef5b9224 100644
(file)
--- a/
tools/scripts/npm/test.sh
+++ b/
tools/scripts/npm/test.sh
@@
-1,8
+1,8
@@
#!/bin/bash
if which node_modules/karma/bin/karma >> /dev/null; then
#!/bin/bash
if which node_modules/karma/bin/karma >> /dev/null; then
- node node_modules/karma/bin/karma start
tests/karma.conf.js
+ node node_modules/karma/bin/karma start
elif which karma >> /dev/null ; then
elif which karma >> /dev/null ; then
- karma start
tests/karma.conf.js
+ karma start
else
echo "ERROR: Failed to find karma"
exit 1
else
echo "ERROR: Failed to find karma"
exit 1