Also move syntax_tests under tests (#7090)

* Remove ml syntax tests

* compiler/syntax/tests -> tests/syntax_tests

* Adapt scripts

* Always run the syntax tests

Author: cknitt

.github/workflows/ci.yml

@@ -130,8 +130,6 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2 # to be able to check for changes in subfolder compiler/syntax later
 
       - name: Use Node.js
         uses: actions/setup-node@v4
@@ -297,22 +295,12 @@ jobs:
         if: steps.ninja-build-cache.outputs.cache-hit != 'true'
         run: node ./scripts/copyExes.js -ninja
 
-      - name: "Check if syntax subfolder has changed"
-        id: syntax-diff
-        shell: bash
-        run: |
-          if git diff --name-only --exit-code HEAD^ HEAD -- compiler/syntax; then
-            echo "syntax_status=unchanged" >> $GITHUB_ENV
-          else
-            echo "syntax_status=changed" >> $GITHUB_ENV
-          fi
-
       - name: "Syntax: Run roundtrip tests"
-        if: ${{ env.syntax_status == 'changed' && runner.os != 'Windows' }}
+        if: ${{ runner.os != 'Windows' }}
         run: opam exec -- make test-syntax-roundtrip
 
       - name: "Syntax: Run tests (Windows)"
-        if: ${{ env.syntax_status == 'changed' && runner.os == 'Windows' }}
+        if: ${{ runner.os == 'Windows' }}
         run: opam exec -- make test-syntax
 
       - name: Build runtime/stdlib

compiler/syntax/testrunner/res_test.ml

@@ -1,6 +1,6 @@
 module IO = Res_io
 
-let data_dir = "compiler/syntax/tests"
+let data_dir = "tests/syntax_tests"
 
 (* test printing of .res file*)
 let () =

compiler/syntax/tests/api/mlSyntax.ml

@@ -4,5 +4,5 @@ shopt -s extglob
 
 dune build @fmt --auto-promote
 
-files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*")
+files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -path "tests/syntax_tests/*" ! -path "tests/gentype_tests/typescript-react-example/node_modules/*")
 ./cli/rescript format $files

compiler/syntax/tests/api/mliSyntax.mli

@@ -17,7 +17,7 @@ case "$(uname -s)" in
     fi
 
     echo "Checking ReScript code formatting..."
-    files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -path "tests/gentype_tests/typescript-react-example/node_modules/*")
+    files=$(find runtime tests -type f \( -name "*.res" -o -name "*.resi" \) ! -name "syntaxErrors*" ! -path "tests/syntax_tests/*" ! -path "tests/gentype_tests/typescript-react-example/node_modules/*")
     if ./cli/rescript format -check $files; then
       printf "${successGreen}✅ ReScript code formatting ok.${reset}\n"
     else

scripts/format.sh

@@ -23,29 +23,29 @@ function maybeWait {
   [[ $((taskCount % 20)) = 0 ]] && wait
 }
 
-pushd compiler/syntax
+pushd tests
 
 rm -rf temp
 mkdir temp
 
 # parsing
-find tests/parsing/{errors,infiniteLoops,recovery} -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/parsing/{errors,infiniteLoops,recovery} -name "*.res" -o -name "*.resi" >temp/files.txt
 while read file; do
   $DUNE_BIN_DIR/res_parser -recover -print ml $file &> $(exp $file) & maybeWait
 done <temp/files.txt
-find tests/parsing/{grammar,other} -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/parsing/{grammar,other} -name "*.res" -o -name "*.resi" >temp/files.txt
 while read file; do
   $DUNE_BIN_DIR/res_parser -print ml $file &> $(exp $file) & maybeWait
 done <temp/files.txt
 
 # printing
-find tests/{printer,conversion} -name "*.res" -o -name "*.resi" -o -name "*.ml" -o -name "*.mli" >temp/files.txt
+find syntax_tests/{printer,conversion} -name "*.res" -o -name "*.resi" -o -name "*.ml" -o -name "*.mli" >temp/files.txt
 while read file; do
   $DUNE_BIN_DIR/res_parser $file &> $(exp $file) & maybeWait
 done <temp/files.txt
 
 # printing with ppx
-find tests/ppx/react -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/ppx/react -name "*.res" -o -name "*.resi" >temp/files.txt
 while read file; do
   $DUNE_BIN_DIR/res_parser -jsx-version 4 -jsx-mode "automatic" $file &> $(exp $file) & maybeWait
 done <temp/files.txt
@@ -61,7 +61,7 @@ diff=$(cat temp/diff.txt)
 if [[ $diff = "" ]]; then
   printf "${successGreen}✅ No unstaged tests difference.${reset}\n"
 else
-  printf "${warningYellow}⚠️ There are unstaged differences in tests/! Did you break a test?\n${diff}\n${reset}"
+  printf "${warningYellow}⚠️ There are unstaged differences in syntax_tests/! Did you break a test?\n${diff}\n${reset}"
   rm -r temp/
   exit 1
 fi
@@ -72,7 +72,7 @@ if [[ $ROUNDTRIP_TEST = 1 ]]; then
   roundtripTestsResult="temp/result.txt"
   touch $roundtripTestsResult
 
-  find tests/{idempotency,printer} -name "*.res" -o -name "*.resi" >temp/files.txt
+  find syntax_tests/{idempotency,printer} -name "*.res" -o -name "*.resi" >temp/files.txt
   while read file; do {
     mkdir -p temp/$(dirname $file)
     sexpAst1=temp/$file.sexp

scripts/format_check.sh

@@ -1 +1,2 @@
 lib/
+temp/