test: update cli arg ordering

Author: Bushuo

rewatch/tests/compile.sh

@@ -33,48 +33,48 @@ fi
 node ./packages/main/src/Main.mjs > ./packages/main/src/output.txt
 
 mv ./packages/main/src/Main.res ./packages/main/src/Main2.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/rename-file.txt
+rewatch build --snapshot-output &> ../tests/snapshots/rename-file.txt
 mv ./packages/main/src/Main2.res ./packages/main/src/Main.res
 
 # Rename a file with a dependent - this should trigger an error
 mv ./packages/main/src/InternalDep.res ./packages/main/src/InternalDep2.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/rename-file-internal-dep.txt
+rewatch build --snapshot-output &> ../tests/snapshots/rename-file-internal-dep.txt
 # normalize paths so the snapshot is the same on all machines
 normalize_paths ../tests/snapshots/rename-file-internal-dep.txt
 mv ./packages/main/src/InternalDep2.res ./packages/main/src/InternalDep.res
 
 # Rename a file with a dependent in a namespaced package - this should trigger an error (regression)
 mv ./packages/new-namespace/src/Other_module.res ./packages/new-namespace/src/Other_module2.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/rename-file-internal-dep-namespace.txt
+rewatch build --snapshot-output &> ../tests/snapshots/rename-file-internal-dep-namespace.txt
 # normalize paths so the snapshot is the same on all machines
 normalize_paths ../tests/snapshots/rename-file-internal-dep-namespace.txt
 mv ./packages/new-namespace/src/Other_module2.res ./packages/new-namespace/src/Other_module.res
 
 rewatch build &>  /dev/null
 mv ./packages/main/src/ModuleWithInterface.resi ./packages/main/src/ModuleWithInterface2.resi
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/rename-interface-file.txt
+rewatch build --snapshot-output &> ../tests/snapshots/rename-interface-file.txt
 # normalize paths so the snapshot is the same on all machines
 normalize_paths ../tests/snapshots/rename-interface-file.txt
 mv ./packages/main/src/ModuleWithInterface2.resi ./packages/main/src/ModuleWithInterface.resi
 rewatch build &> /dev/null
 mv ./packages/main/src/ModuleWithInterface.res ./packages/main/src/ModuleWithInterface2.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/rename-file-with-interface.txt
+rewatch build --snapshot-output &> ../tests/snapshots/rename-file-with-interface.txt
 # normalize paths so the snapshot is the same on all machines
 normalize_paths ../tests/snapshots/rename-file-with-interface.txt
 mv ./packages/main/src/ModuleWithInterface2.res ./packages/main/src/ModuleWithInterface.res
 rewatch build &> /dev/null
 
 # when deleting a file that other files depend on, the compile should fail
 rm packages/dep02/src/Dep02.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/remove-file.txt
+rewatch build --snapshot-output &> ../tests/snapshots/remove-file.txt
 # normalize paths so the snapshot is the same on all machines
 normalize_paths ../tests/snapshots/remove-file.txt
 git checkout -- packages/dep02/src/Dep02.res
 rewatch build &> /dev/null
 
 # it should show an error when we have a dependency cycle
 echo 'Dep01.log()' >> packages/new-namespace/src/NS_alias.res
-rewatch build --no-timing --snapshot-output &> ../tests/snapshots/dependency-cycle.txt
+rewatch build --snapshot-output &> ../tests/snapshots/dependency-cycle.txt
 git checkout -- packages/new-namespace/src/NS_alias.res
 
 # it should compile dev dependencies with the --dev flag

rewatch/tests/suite-ci.sh

@@ -8,10 +8,13 @@ cd $(dirname $0)
 # Get rewatch executable location from the first argument or use default
 if [ -n "$1" ]; then
   REWATCH_EXECUTABLE="$1"
+  BSC_PATH=""
 else
-  REWATCH_EXECUTABLE="../target/release/rewatch --bsc-path ../../_build/install/default/bin/bsc"
+  REWATCH_EXECUTABLE="../target/release/rewatch"
+  BSC_PATH="--bsc-path ../../_build/install/default/bin/bsc"
 fi
 export REWATCH_EXECUTABLE
+export BSC_PATH
 
 source ./utils.sh
 

rewatch/tests/utils.sh

@@ -3,8 +3,8 @@ overwrite() { echo -e "\r\033[1A\033[0K$@"; }
 success() { echo -e "- ✅ \033[32m$1\033[0m"; }
 error() { echo -e "- 🛑 \033[31m$1\033[0m"; }
 bold() { echo -e "\033[1m$1\033[0m"; }
-rewatch() { RUST_BACKTRACE=1 $REWATCH_EXECUTABLE $@; }
-rewatch_bg() { RUST_BACKTRACE=1 nohup $REWATCH_EXECUTABLE $@; }
+rewatch() { RUST_BACKTRACE=1 $REWATCH_EXECUTABLE $@ $BSC_PATH; }
+rewatch_bg() { RUST_BACKTRACE=1 nohup $REWATCH_EXECUTABLE $@ $BSC_PATH; }
 
 # Detect if running on Windows
 is_windows() {