Fix codecov with path arguments and explicit test

- Test file now takes path to vims, test dir
- Travis now actually calls the test script

Author: MilesCranmer

.travis.yml

@@ -12,7 +12,7 @@ addons:
             - cmake
             - vim
 
-script: cd test && ./test.sh
+script: TEST_DIR=$(pwd)/test VIMS=./vims ./test/test.sh
 
 after_success: |
     wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz &&
@@ -26,5 +26,5 @@ after_success: |
     cd ../.. &&
     rm -rf kcov-master &&
     mkdir -p coverage &&
-    kcov coverage script.sh &&
+    TEST_DIR=$(pwd)/test VIMS=./vims kcov coverage ./test/test.sh &&
     bash <(curl -s https://codecov.io/bash)

test/test.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 # From http://tldp.org/LDP/abs/html/debugging.html
+VIMS=./vims
+
 assert ()
 {
     E_PARAM_ERR=98
@@ -19,68 +21,68 @@ assert ()
     fi
 }
 
-cat test_files/python.py | ../vims '' > .tmp
-DIFF=$(diff -b .tmp test_files/python.py)
+cat $TEST_DIR/test_files/python.py | $VIMS '' > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python.py)
 TEST_NUM=0
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to do a non-edit passed"
 
-cat test_files/python.py | ../vims -e '^\s\+def __init__' 'V/^\\s\\+def\<enter>kdGp' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_init_at_bottom.py)
+cat $TEST_DIR/test_files/python.py | $VIMS -e '^\s\+def __init__' 'V/^\\s\\+def\<enter>kdGp' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_init_at_bottom.py)
 TEST_NUM=1
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to move init to bottom passed"
 
-cat test_files/python.py | ../vims -n '$-3,$p' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_last_4_lines.py)
+cat $TEST_DIR/test_files/python.py | $VIMS -n '$-3,$p' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_last_4_lines.py)
 TEST_NUM=2
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to print last 4 lines passed"
 
-cat test_files/python.py | ../vims -s '/^class\<enter>O# This class is for Bifrost\<esc>Go\<enter># This file does not run!' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_with_extra_comments.py)
+cat $TEST_DIR/test_files/python.py | $VIMS -s '/^class\<enter>O# This class is for Bifrost\<esc>Go\<enter># This file does not run!' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_with_extra_comments.py)
 TEST_NUM=3
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to do one long 'simple' command passed"
 
-cat test_files/python.py | ../vims -s 'x' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_minus_one_char.py)
+cat $TEST_DIR/test_files/python.py | $VIMS -s 'x' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_minus_one_char.py)
 TEST_NUM=4
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to do one short 'simple' command passed"
 
-cat test_files/python.py | ../vims -e '.*' ':m0\<enter>' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_reversed.py)
+cat $TEST_DIR/test_files/python.py | $VIMS -e '.*' ':m0\<enter>' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_reversed.py)
 TEST_NUM=5
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to reverse a file with exe passed"
 
-cat test_files/python.py | ../vims '%g/.*/m0' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/python_reversed.py)
+cat $TEST_DIR/test_files/python.py | $VIMS '%g/.*/m0' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/python_reversed.py)
 TEST_NUM=6
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to reverse a file in normal mode passed"
 
-cat test_files/numbers.txt | ../vims -e '^5$' 'dd' -t '%g/^3$/t$' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/numbers_5_gone_3_bottom.txt)
+cat $TEST_DIR/test_files/numbers.txt | $VIMS -e '^5$' 'dd' -t '%g/^3$/t$' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/numbers_5_gone_3_bottom.txt)
 TEST_NUM=7
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to turn back off exe mode passed"
 
-cat test_files/numbers.txt | ../vims -e '^5$' 'dd' -s ':%g/^3$/t$\<enter>' | cat > .tmp
-DIFF=$(diff -b .tmp test_files/numbers_5_gone_3_bottom.txt)
+cat $TEST_DIR/test_files/numbers.txt | $VIMS -e '^5$' 'dd' -s ':%g/^3$/t$\<enter>' | cat > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/numbers_5_gone_3_bottom.txt)
 TEST_NUM=8
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to run multi-mode commands passed"
 
-cat test_files/numbers.txt | ../vims -l '10\<c-x>' > .tmp
-DIFF=$(diff -b .tmp test_files/numbers_all_decreased.txt)
+cat $TEST_DIR/test_files/numbers.txt | $VIMS -l '10\<c-x>' > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/numbers_all_decreased.txt)
 TEST_NUM=9
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to execute command on every line passed"
 
-cat test_files/numbers.txt | ../vims -r '^1$' 'dd' > .tmp
-DIFF=$(diff -b .tmp test_files/numbers_delete_all_not_1.txt)
+cat $TEST_DIR/test_files/numbers.txt | $VIMS -r '^1$' 'dd' > .tmp
+DIFF=$(diff -b .tmp $TEST_DIR/test_files/numbers_delete_all_not_1.txt)
 TEST_NUM=10
 assert "$DIFF" $LINENO $TEST_NUM
 echo "+ test $TEST_NUM to delete all numbers not 1 passed"