fix

Author: jfrolich

rewatch/tests/compile.sh

@@ -5,7 +5,7 @@ cd ../testrepo
 
 bold "Test: It should compile"
 
-if rewatch clean ;
+if rewatch clean &> /dev/null;
 then
   success "Repo Cleaned"
 else

rewatch/tests/lock.sh

@@ -14,8 +14,20 @@ else
 fi
 
 exit_watcher() { 
-  # we need to kill the parent process (rewatch)
-  kill $(pgrep -P $!);
+  # Try to find parent process, if not found just kill the process directly
+  PARENT_PROCS=$(pgrep -P $!)
+  if [ -n "$PARENT_PROCS" ]; then
+    kill $PARENT_PROCS &>/dev/null
+  fi
+  # for if it's the node script that runs rewatch also kill the child processes
+  CHILD_PROCS=$(pgrep -f rewatch)
+  if [ -n "$CHILD_PROCS" ]; then
+    kill $! &>/dev/null
+    kill $CHILD_PROCS &>/dev/null
+  else
+    # Last resort: just kill the background process
+    kill $!
+  fi
 }
 
 rewatch watch &>/dev/null &

rewatch/tests/suffix.sh

@@ -31,7 +31,7 @@ if [ "$file_count" -eq 20 ];
 then
   success "Found files with correct suffix"
 else
-  error "Suffix not correctly used"
+  error "Suffix not correctly used (file count of $file_count)"
   exit 1
 fi
 

rewatch/tests/suite-ci.sh

@@ -13,13 +13,13 @@ export REWATCH_EXECUTABLE
 source ./utils.sh
 
 bold "Rescript version"
-(cd ../testrepo && yarn rescript -v)
+(cd ../testrepo && ./node_modules/.bin/rescript -v)
 
 # we need to reset the yarn.lock and package.json to the original state
 # so there is not diff in git. The CI will install new ReScript package
 bold "Reset package.json and yarn.lock"
-git checkout ../testrepo/yarn.lock
-git checkout ../testrepo/package.json
+git checkout ../testrepo/yarn.lock &> /dev/null
+git checkout ../testrepo/package.json &> /dev/null
 success "Reset package.json and yarn.lock"
 
 bold "Make sure the testrepo is clean"