suite-ci.sh -> suite.sh

Author: cknitt

.github/workflows/ci.yml

@@ -363,7 +363,7 @@ jobs:
         shell: bash
 
       - name: Run rewatch tests
-        run: ./rewatch/tests/suite-ci.sh
+        run: ./rewatch/tests/suite.sh
         shell: bash
 
       - name: Run syntax benchmarks
@@ -671,7 +671,7 @@ jobs:
         working-directory: rewatch/testrepo
 
       - name: Run rewatch integration tests
-        run: ./rewatch/tests/suite-ci.sh node_modules/.bin/rescript
+        run: ./rewatch/tests/suite.sh node_modules/.bin/rescript
         shell: bash
 
   publish:

AGENTS.md

@@ -373,7 +373,7 @@ make test-rewatch     # Run integration tests
 
 **Note**: The rewatch project is located in the `rewatch/` directory with its own `Cargo.toml` file. All cargo commands should be run from the project root using the `--manifest-path rewatch/Cargo.toml` flag, as shown in the CI workflow.
 
-**Integration Tests**: The `make test-rewatch` command runs bash-based integration tests located in `rewatch/tests/suite-ci.sh`. These tests use the `rewatch/testrepo/` directory as a test workspace with various package configurations to verify rewatch's behavior across different scenarios.
+**Integration Tests**: The `make test-rewatch` command runs bash-based integration tests located in `rewatch/tests/suite.sh`. These tests use the `rewatch/testrepo/` directory as a test workspace with various package configurations to verify rewatch's behavior across different scenarios.
 
 #### Debugging
 

Makefile

@@ -176,7 +176,7 @@ test-gentype: | $(YARN_INSTALL_STAMP)
 	make -C tests/gentype_tests/stdlib-no-shims clean test
 
 test-rewatch: $(RESCRIPT_EXE) | $(YARN_INSTALL_STAMP)
-	./rewatch/tests/suite-ci.sh
+	./rewatch/tests/suite.sh
 
 test-all: test test-gentype test-analysis test-tools test-rewatch
 

rewatch/tests/suite-ci.sh

@@ -1,3 +1,47 @@
 #!/bin/bash
+
+unset CLICOLOR_FORCE
+
+# Make sure we are in the right directory
 cd $(dirname $0)
-./suite-ci.sh
+
+# Get rewatch executable location from the first argument or use default
+if [ -n "$1" ]; then
+  REWATCH_EXECUTABLE="$1"
+else
+  REWATCH_EXECUTABLE="../target/release/rescript"
+  eval $(node ./get_bin_paths.js)
+fi
+
+export REWATCH_EXECUTABLE
+export RESCRIPT_BSC_EXE
+export RESCRIPT_RUNTIME
+
+source ./utils.sh
+
+bold "Yarn install"
+(cd ../testrepo && yarn)
+
+bold "Rescript version"
+(cd ../testrepo && ./node_modules/.bin/rescript --version)
+
+# 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 &> /dev/null
+git checkout ../testrepo/package.json &> /dev/null
+success "Reset package.json and yarn.lock"
+
+bold "Make sure the testrepo is clean"
+if git diff --exit-code ../testrepo &> diff.txt;
+then
+  rm diff.txt
+  success "Testrepo has no changes"
+else
+  error "Testrepo is not clean to start with"
+  cat diff.txt
+  rm diff.txt
+  exit 1
+fi
+
+./compile.sh && ./watch.sh && ./lock.sh && ./suffix.sh && ./format.sh && ./clean.sh && ./experimental.sh && ./experimental-invalid.sh && ./compiler-args.sh