Fix logs in the wrong place when runnning tests withotu basedir

kgonidis · Sep 19, 2020 · 9e2526c · 9e2526c
1 parent 75e1c6b
commit 9e2526c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -115,7 +115,7 @@ jobs:
       if: failure()
       with:
         name: 'test-logs-${{ runner.os }}'
-        path: 'tests/logs/**/*'
+        path: 'tests/logs'
 
     - run: ./make_package macos ${{ github.run_id }}
       name: 'Package'

diff --git a/run_tests b/run_tests
@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
 
-BASEDIR=$(dirname $0)
+SetBaseDir() {
+  BASEDIR=$1
+  if [[ ! $BASEDIR = /* ]]; then
+    # Relative
+    BASEDIR=$(pwd)/${BASEDIR}
+  fi
+}
+
+SetBaseDir $(dirname $0)
 INSTALL=0
 UPDATE=0
 INSTALLER_ARGS=''
@@ -15,12 +23,8 @@ while [ -n "$1" ]; do
   case "$1" in
     "--basedir")
       shift
-      BASEDIR=$1
+      SetBaseDir $1
       shift
-      if [[ ! $BASEDIR = /* ]]; then
-        # Relative
-        BASEDIR=$(pwd)/${BASEDIR}
-      fi
       BASEDIR_CMD="let g:vimspector_base_dir='${BASEDIR}'"
       ;;
     "--install")
@@ -131,6 +135,7 @@ echo "Testing with:"
 echo " * VIMSPECTOR_MIMODE=$VIMSPECTOR_MIMODE"
 echo " * RUN_VIM=$RUN_VIM"
 echo " * RUN_TEST=$RUN_TEST"
+echo " * BASEDIR=$BASEDIR"
 echo " * BASEDIR_CMD=$BASEDIR_CMD"