Update handling of subdirectory creation (#328)

* Update handling of subdirectory creation

* Add conditional statement to only source `nvm` when running locally

* Another attempt at fixing the installation of nvm

* Fix bash syntax for conditional test

* Fix bash conditional test logic

* Set NVM_DIR conditionally based on style (version?) of installation used

* Typo

* Remove redundant hardcoded env var for NVM_DIR

* Add steps from NVM Readme installation section on loading NVM

---------

Co-authored-by: Elango Cheran <[email protected]>

generateDataAndRun.sh

@@ -19,7 +19,18 @@ then
 fi
 
 # Enable seting the version of NodeJS
-export NVM_DIR=$HOME/.nvm;
+# Install NVM if it is not install in CI
+
+if [[ $CI == "true" ]] && ! [ -x "$(command -v nvm)" ]
+then
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+    export NVM_DIR="$HOME/.config/nvm"
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+else
+    export NVM_DIR=$HOME/.nvm
+fi
+
 source $NVM_DIR/nvm.sh;
 
 ##########
@@ -102,9 +113,6 @@ mkdir -p $TEMP_DIR/testOutput
 # Change to directory of `testdriver` (which will be used to invoke each platform executor)
 pushd testdriver
 
-# Set to use NVM
-source "$HOME/.nvm/nvm.sh"
-
 # Invoke all tests
 jq -c '.[]' ../$source_file | while read i; do
     if jq -e 'has("prereq")' <<< $i > /dev/null

testdriver/testplan.py

@@ -272,11 +272,9 @@ def run_one_test_mode(self):
         try:
             result_dir = os.path.dirname(self.outputFilePath)
             if not os.path.isdir(result_dir):
-                os.makedirs(result_dir)
+                os.makedirs(result_dir, exist_ok=True)
         except BaseException as error:
-            sys.stderr.write('!!!%s:  Cannot create directory %sfor report file %s' %
-                             (error, result_dir, self.outputFilePath))
-            return None
+            logging.error('testplay.py: %s for %s / %s', error, result_dir, self.outputFilePath)
 
         # Create results file
         try:

verifier/verifier.py

@@ -71,7 +71,7 @@ def open_verify_files(self, vplan):
             vplan.result_time_stamp = datetime.datetime.fromtimestamp(file_time).strftime('%Y-%m-%d %H:%M')
             vplan.report.timestamp = vplan.result_time_stamp
         except BaseException as err:
-            logging.error('    *** Cannot open results file %s:\n        %s', vplan.result_path, err)
+            logging.error('    *** CANNOT OPEN RESULTS FILE %s:\n        %s', vplan.result_path, err)
             return None
 
         try: