More Makefile fixes (test dependencies, test-rewatch)

Author: cknitt

.github/workflows/ci.yml

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

Makefile

@@ -148,35 +148,37 @@ clean-lib:
 	yarn workspace @rescript/runtime rescript clean
 	rm -f $(RUNTIME_BUILD_STAMP)
 
-# Tests / artifacts / analysis
+# Artifact list
 
 artifacts: lib
 	./scripts/updateArtifactList.js
 
-bench: $(COMPILER_BUILD_STAMP)
+# Tests
+
+bench: compiler
 	$(DUNE_BIN_DIR)/syntax_benchmarks
 
-test: lib ninja | $(YARN_INSTALL_STAMP)
+test: lib ninja
 	node scripts/test.js -all
 
-test-analysis: | $(YARN_INSTALL_STAMP)
+test-analysis: lib ninja
 	make -C tests/analysis_tests clean test
 
-test-tools: | $(YARN_INSTALL_STAMP)
+test-tools: lib ninja
 	make -C tests/tools_tests clean test
 
-test-syntax: | $(YARN_INSTALL_STAMP)
+test-syntax: compiler
 	./scripts/test_syntax.sh
 
-test-syntax-roundtrip: | $(YARN_INSTALL_STAMP)
+test-syntax-roundtrip: compiler
 	ROUNDTRIP_TEST=1 ./scripts/test_syntax.sh
 
-test-gentype: | $(YARN_INSTALL_STAMP)
+test-gentype: lib ninja
 	make -C tests/gentype_tests/typescript-react-example clean test
 	make -C tests/gentype_tests/stdlib-no-shims clean test
 
-test-rewatch: $(RESCRIPT_EXE) | $(YARN_INSTALL_STAMP)
-	./rewatch/tests/suite.sh
+test-rewatch: lib
+	./rewatch/tests/suite.sh $(RESCRIPT_EXE)
 
 test-all: test test-gentype test-analysis test-tools test-rewatch
 

rewatch/tests/clean.sh

@@ -17,7 +17,7 @@ else
 fi
 
 # Then we clean a single project
-error_output=$(cd packages/file-casing && "../../$REWATCH_EXECUTABLE" clean 2>&1)
+error_output=$(cd packages/file-casing && "$REWATCH_EXECUTABLE" clean 2>&1)
 clean_status=$?
 if [ $clean_status -ne 0 ];
 then
@@ -86,7 +86,7 @@ fi
 bold "Test: It should clean dependencies from node_modules"
 
 # Build a package with external dependencies
-error_output=$(cd packages/with-dev-deps && "../../$REWATCH_EXECUTABLE" build 2>&1)
+error_output=$(cd packages/with-dev-deps && "$REWATCH_EXECUTABLE" build 2>&1)
 if [ $? -eq 0 ];
 then
   success "Built with-dev-deps"
@@ -97,7 +97,7 @@ else
 fi
 
 # Then we clean a single project
-error_output=$(cd packages/with-dev-deps && "../../$REWATCH_EXECUTABLE" clean 2>&1)
+error_output=$(cd packages/with-dev-deps && "$REWATCH_EXECUTABLE" clean 2>&1)
 clean_status=$?
 if [ $clean_status -ne 0 ];
 then

rewatch/tests/compile.sh

@@ -37,7 +37,7 @@ fi
 # Build from standalone package folder using `rescript build`
 bold "Test: Standalone package can build via rescript from package folder"
 pushd ./packages/standalone > /dev/null
-error_output=$("../../$REWATCH_EXECUTABLE" build 2>&1)
+error_output=$("$REWATCH_EXECUTABLE" build 2>&1)
 if [ $? -eq 0 ];
 then
   success "Standalone package built"

rewatch/tests/compiler-args.sh

@@ -6,15 +6,15 @@ cd ../testrepo
 bold "Test: It should not matter where we grab the compiler-args for a file"
 # Capture stdout for both invocations
 stdout_root=$(rewatch compiler-args packages/file-casing/src/Consume.res 2>/dev/null)
-stdout_pkg=$(cd packages/file-casing && "../../$REWATCH_EXECUTABLE" compiler-args src/Consume.res 2>/dev/null)
+stdout_pkg=$(cd packages/file-casing && "$REWATCH_EXECUTABLE" compiler-args src/Consume.res 2>/dev/null)
 
 error_output=$(rewatch compiler-args packages/file-casing/src/Consume.res 2>&1)
 if [ $? -ne 0 ]; then
   error "Error grabbing compiler args for packages/file-casing/src/Consume.res"
   printf "%s\n" "$error_output" >&2
   exit 1
 fi
-error_output=$(cd packages/file-casing && "../../$REWATCH_EXECUTABLE" compiler-args src/Consume.res 2>&1)
+error_output=$(cd packages/file-casing && "$REWATCH_EXECUTABLE" compiler-args src/Consume.res 2>&1)
 if [ $? -ne 0 ]; then
   error "Error grabbing compiler args for src/Consume.res in packages/file-casing"
   printf "%s\n" "$error_output" >&2

rewatch/tests/format.sh

@@ -45,7 +45,7 @@ fi
 
 bold "Test: It should format only the current project"
 
-error_output=$(cd packages/file-casing && "../../$REWATCH_EXECUTABLE" format)
+error_output=$(cd packages/file-casing && "$REWATCH_EXECUTABLE" format)
 git_diff_file_count=$(git diff --name-only ./ | wc -l | xargs)
 if [ $? -eq 0 ] && [ $git_diff_file_count -eq 2 ];
 then

rewatch/tests/get_bin_paths.js

@@ -1,15 +1,6 @@
 // @ts-check
 import { bsc_exe } from "../../cli/common/bins.js";
-import path from "node:path";
-
-const runtimePath = path.resolve(
-  import.meta.dirname,
-  "..",
-  "..",
-  "packages",
-  "@rescript",
-  "runtime"
-);
+import { runtimePath } from "../../cli/common/runtime.js";
 
 console.log(`RESCRIPT_BSC_EXE='${bsc_exe}'`);
 console.log(`RESCRIPT_RUNTIME='${runtimePath}'`);

rewatch/tests/suite.sh

@@ -1,22 +1,31 @@
 #!/bin/bash
 
+set -e
+
 unset CLICOLOR_FORCE
 
+if [ "$#" -ne 1 ]; then
+  echo "Usage: $0 <rewatch executable>"
+  exit 1
+fi
+
+REWATCH_EXECUTABLE="$(realpath "$1")"
+export REWATCH_EXECUTABLE
+
 # Make sure we are in the right directory
 cd $(dirname $0)
 
-# Get rewatch executable location from the first argument or use default
-if [ -n "$1" ]; then
-  REWATCH_EXECUTABLE="$1"
+if [[ "$REWATCH_EXECUTABLE" == */cli/rescript.js ]]; then
+  echo "Using rewatch CLI script: $REWATCH_EXECUTABLE"
 else
-  REWATCH_EXECUTABLE="../target/release/rescript"
+  echo "Using rewatch executable: $REWATCH_EXECUTABLE"
   eval $(node ./get_bin_paths.js)
+  export RESCRIPT_BSC_EXE
+  export RESCRIPT_RUNTIME
+  echo Using bsc executable: $RESCRIPT_BSC_EXE
+  echo Using runtime path: $RESCRIPT_RUNTIME
 fi
 
-export REWATCH_EXECUTABLE
-export RESCRIPT_BSC_EXE
-export RESCRIPT_RUNTIME
-
 source ./utils.sh
 
 bold "Yarn install"