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

diff --git a/test/.gitignore b/test/.gitignore
index 3c3629e..1e39bc5 100644 (file)
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1 +1,6 @@
 node_modules
+logs/error_log
+logs/jasmine-dev
+logs/mkws-jasmine-access.log
+logs/mkws-jasmine-error.log
+logs/mkws-jasmine-rewrite.log

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

diff --git a/test/logs/.gitignore b/test/logs/.gitignore
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/test/logs/.gitkeep b/test/logs/.gitkeep
new file mode 100644 (file)
index 0000000..e69de29