aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.ci/.gitattributes1
-rw-r--r--.gitattributes2
-rw-r--r--.travis.yml2
-rwxr-xr-xtest/stress_test.sh (renamed from .ci/stress_test.sh)2
4 files changed, 4 insertions, 3 deletions
diff --git a/.ci/.gitattributes b/.ci/.gitattributes
deleted file mode 100644
index dfdb8b7..0000000
--- a/.ci/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.sh text eol=lf
diff --git a/.gitattributes b/.gitattributes
index 176a458..d76765e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,3 @@
* text=auto
+
+*.sh text eol=lf
diff --git a/.travis.yml b/.travis.yml
index 163a334..da019f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ script:
- "$HOME/install/bin/math-server-unit-tests"
- "$HOME/install/bin/math-server-benchmarks"
- - ../.ci/stress_test.sh
+ - ../test/stress_test.sh
jobs:
fast_finish: true
diff --git a/.ci/stress_test.sh b/test/stress_test.sh
index eba52d2..ceac401 100755
--- a/.ci/stress_test.sh
+++ b/test/stress_test.sh
@@ -16,7 +16,7 @@ readonly script_dir
install_dir="$HOME/install"
readonly server_path='bin/math-server'
readonly client_path='bin/math-client'
-readonly stress_test_path="$script_dir/../test/stress_test.py"
+readonly stress_test_path="$script_dir/stress_test.py"
readonly server_port=16666
server_pid=