Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/test/Makefile b/test/Makefile
index f92f26b..7cd3e14 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -28,7 +28,7 @@ distclean: clean clean-tmp
 clean-tmp:
        rm -rf ${TMP_DIR}
        mkdir -p ${TMP_DIR}
-       touch ${TMP_DIR}/.gitkeep
+       touch ${TMP_DIR}/.gitignore
 
 mkws-complete-syntax-check:
        ${MAKE} -C../src mkws-complete.min.js

diff --git a/test/bin/bomb.pl b/test/bin/bomb.pl
index f4b4cec..5671a53 100755 (executable)
--- a/test/bin/bomb.pl
+++ b/test/bin/bomb.pl
@@ -28,17 +28,16 @@ sub set_alarm {
         warn "Time out alarm $time\n";
 
         # sends a hang-up signal to all processes in the current process group
-        # and kill running java processes
         local $SIG{HUP} = "IGNORE";
         kill 1, -$$;
+        sleep 0.2;
 
         local $SIG{TERM} = "IGNORE";
         kill 15, -$$;
+        sleep 0.2;
         kill 15, -$$;
 
         warn "Send a hang-up to all childs.\n";
-
-        #exit 1;
     };
 
     warn "set alarm time to: $time seconds $message\n" if $debug >= 1;

diff --git a/tools/bin/mkws-bootstrap.sh b/tools/bin/mkws-bootstrap.sh
index 1aefc93..6473ceb 100755 (executable)
--- a/tools/bin/mkws-bootstrap.sh
+++ b/tools/bin/mkws-bootstrap.sh
@@ -16,7 +16,7 @@ git clone -q ssh://git.indexdata.com:222/home/git/private/mkws.git
 cd mkws
 
 test -n "$debug" && echo "start bootstraping in $dir"
-if make check > mkws.log 2>&1; then
+if make check phantomjs > mkws.log 2>&1; then
     test -n "$debug" && echo "Ok"
     test -z "$debug" && rm -rf $dir
     exit 0