Move test infra inside tests/

Author: cristianoc

analysis/Makefile

@@ -8,21 +8,17 @@ build-native:
 dce: build-native
 	opam exec reanalyze.exe -- -dce-cmt _build -suppress vendor
 
-tests/node_modules/.bin/rescript:
-	@cd tests && npm install
-
-test-analysis-binary: build-native tests/node_modules/.bin/rescript
-	@cd tests && node_modules/.bin/rescript
-	./test.sh
+test-analysis-binary: build-native
+	make -C tests test
 
 test-reanalyze: build-native
 	make -C reanalyze test
 
 test: test-analysis-binary test-reanalyze
 
-clean: tests/node_modules/.bin/rescript
+clean:
 	rm -f rescript-editor-analysis.exe
-	@cd tests && node_modules/.bin/rescript clean
+	make -C tests test
 	dune clean
 	make -C reanalyze clean
 

analysis/tests/Makefile

@@ -0,0 +1,15 @@
+SHELL = /bin/bash
+
+node_modules/.bin/rescript:
+	npm install
+
+test: node_modules/.bin/rescript
+	node_modules/.bin/rescript
+	./test.sh
+
+clean: node_modules/.bin/rescript
+	node_modules/.bin/rescript clean -with-deps
+
+.DEFAULT_GOAL := test
+
+.PHONY: clean test

analysis/tests/src/expected/Auto.res.txt

@@ -1,3 +1,3 @@
-Hover tests/src/Auto.res 2:13
+Hover src/Auto.res 2:13
 {"contents": "```rescript\n(Belt.List.t<'a>, 'a => 'b) => Belt.List.t<'b>\n```\n\n\n  `map xs f`\n\n  **return** the list obtained by applying `f` to each element of `xs`\n\n  ```\n  map [1;2] (fun x-> x + 1) = [3;4]\n  ```\n"}
 

analysis/tests/src/expected/CompletePrioritize1.res.txt

@@ -1,4 +1,4 @@
-Complete tests/src/CompletePrioritize1.res 5:6
+Complete src/CompletePrioritize1.res 5:6
 posCursor:[5:6] posNoWhite:[5:5] Found expr:[5:3->0:-1]
 Completable: Cpath Value[a]->
 [{

analysis/tests/src/expected/CompletePrioritize2.res.txt

@@ -1,4 +1,4 @@
-Complete tests/src/CompletePrioritize2.res 9:7
+Complete src/CompletePrioritize2.res 9:7
 posCursor:[9:7] posNoWhite:[9:6] Found expr:[9:3->0:-1]
 Completable: Cpath Value[ax]->
 [{
@@ -9,7 +9,7 @@ Completable: Cpath Value[ax]->
     "documentation": null
   }]
 
-Complete tests/src/CompletePrioritize2.res 12:5
+Complete src/CompletePrioritize2.res 12:5
 posCursor:[12:5] posNoWhite:[12:4] Found expr:[12:3->12:5]
 Pexp_ident ax:[12:3->12:5]
 Completable: Cpath Value[ax]