tests/syntax_tests/* -> tests/syntax_tests/data/*

Author: cknitt

compiler/syntax/testrunner/res_test.ml

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

scripts/test_syntax.sh

@@ -10,8 +10,6 @@ scriptDir=`dirname $0`
 # so let's use this workaround instead.
 DUNE_BIN_DIR=`cd "$scriptDir/../_build/install/default/bin"; pwd -P`
 
-$DUNE_BIN_DIR/syntax_tests
-
 function exp {
   echo "$(dirname $1)/expected/$(basename $1).txt"
 }
@@ -29,23 +27,23 @@ rm -rf temp
 mkdir temp
 
 # parsing
-find syntax_tests/parsing/{errors,infiniteLoops,recovery} -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/data/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 syntax_tests/parsing/{grammar,other} -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/data/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 syntax_tests/{printer,conversion} -name "*.res" -o -name "*.resi" -o -name "*.ml" -o -name "*.mli" >temp/files.txt
+find syntax_tests/data/{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 syntax_tests/ppx/react -name "*.res" -o -name "*.resi" >temp/files.txt
+find syntax_tests/data/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 +59,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 syntax_tests/! Did you break a test?\n${diff}\n${reset}"
+  printf "${warningYellow}⚠️ There are unstaged differences in syntax_tests/data/! Did you break a test?\n${diff}\n${reset}"
   rm -r temp/
   exit 1
 fi
@@ -72,7 +70,7 @@ if [[ $ROUNDTRIP_TEST = 1 ]]; then
   roundtripTestsResult="temp/result.txt"
   touch $roundtripTestsResult
 
-  find syntax_tests/{idempotency,printer} -name "*.res" -o -name "*.resi" >temp/files.txt
+  find syntax_tests/data/{idempotency,printer} -name "*.res" -o -name "*.resi" >temp/files.txt
   while read file; do {
     mkdir -p temp/$(dirname $file)
     sexpAst1=temp/$file.sexp