Clean up

ci/driver.sh

@@ -187,9 +187,9 @@ for pr in $open_pr_list; do
 
     # run build and testing command
     echo "Running run_ci.sh for $PR_TEST_DIR/$pr/$BASE_REPO at $(date)"
-    run_ci_cmd="$my_dir/run_ci.sh -d $PR_TEST_DIR/$pr/$BASE_REPO -o $PR_TEST_DIR/$pr/output_${commit} -R gdasapp"
+    run_ci_cmd="$my_dir/run_ci.sh -d $PR_TEST_DIR/$pr/$BASE_REPO -o $PR_TEST_DIR/$pr/output_${commit}"
     if [[ $TEST_WORKFLOW == 1 ]]; then
-      # get ci tests from PR description and convert into a regular expressions to be exclude
+      # get ci tests from PR description and convert into a regular expressions to be excluded
       branch_body=$(gh pr view $pr --repo ${gdasapp_url} --json body --jq '.body')
       ci_checklist=$(echo "$branch_body" | grep '\[x\]')
       ctest_regex_exclude=""  
@@ -199,7 +199,7 @@ for pr in $open_pr_list; do
 	fi      
       done
 
-      # setup run_ci.sh arguments to exclude chosen CI tests
+      # setup run_ci.sh arguments to test in the Global Workflow and exclude chosen CI tests
       run_ci_cmd+=" -w"
       if [ -n "$ctest_regex_exclude" ]; then
         run_ci_cmd+=" -E $ctest_regex_exclude"

ci/run_ci.sh

@@ -10,7 +10,6 @@ usage() {
   echo "  -d  Run build and ctest for clone in <directory>"
   echo "  -o  Path to output message detailing results of CI tests"
   echo "  -w  Test GDASApp within the Global Workflow"
-  echo "  -R  Regular expression of CTests to include"
   echo "  -E  Regular expression of CTests to exclude"
   echo "  -h  display this message and quit"
   echo
@@ -19,19 +18,15 @@ usage() {
 
 # ==============================================================================
 TEST_WORKFLOW=0
-ctest_regex_include=""
 ctest_regex_exclude=""
-while getopts "d:o:h:R:E:w" opt; do
+while getopts "d:o:h:E:w" opt; do
   case $opt in
     d)
       repodir=$OPTARG
       ;;
     o)
       outfile=$OPTARG
       ;;
-    R)
-      ctest_regex_include+=$OPTARG
-      ;;
     E)
       ctest_regex_exclude+=$OPTARG
       ;;
@@ -97,10 +92,7 @@ module use $gdasapp_dir/modulefiles
 module load GDAS/$TARGET
 echo "---------------------------------------------------" >> $outfile
 rm -rf log.ctest
-ctest_cmd="ctest -j${NTASKS_TESTS}"
-if [ -n "$ctest_regex_include" ]; then
-  ctest_cmd+=" -R $ctest_regex_include"
-fi
+ctest_cmd="ctest -j${NTASKS_TESTS} -R gdasapp"
 if [ -n "$ctest_regex_exclude" ]; then
   ctest_cmd+=" -E $ctest_regex_exclude"
 fi