From fa1c89a97457a518f83db7de4a8faefd4f42cd72 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Fri, 28 Jul 2017 05:59:39 -0700
Subject: [PATCH] [build] fix clang and java-only tests

Summary: The tests wouldn't pass in clang-only or Java-only mode.

Reviewed By: mbouaziz

Differential Revision: D5498555

fbshipit-source-id: 8e49b8d
---
 .gitignore | 10 ++++++++--
 Makefile   | 17 +++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1b5640e2..253c2e43b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,8 +122,14 @@ buck-out/
 /infer/src/toplevel.mlpack
 
 #atdgen stubs
-/infer/src/backend/jsonbug_*
-/infer/src/checkers/stacktree_*
+/infer/src/backend/jsonbug_j.ml
+/infer/src/backend/jsonbug_j.mli
+/infer/src/backend/jsonbug_t.ml
+/infer/src/backend/jsonbug_t.mli
+/infer/src/checkers/stacktree_j.ml
+/infer/src/checkers/stacktree_j.mli
+/infer/src/checkers/stacktree_t.ml
+/infer/src/checkers/stacktree_t.mli
 
 # intelliJ files
 /infer/src/backend/.projectSettings
diff --git a/Makefile b/Makefile
index 54b6637d5..96250f19c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,6 @@ BUILD_SYSTEMS_TESTS += \
   reactive \
   run_hidden_linters \
   utf8_in_procname \
-  waf \
 
 DIRECT_TESTS += \
   c_biabduction c_bufferoverrun c_errors c_frontend \
@@ -77,6 +76,9 @@ BUILD_SYSTEMS_TESTS += ant
 endif
 ifneq ($(BUCK),no)
 BUILD_SYSTEMS_TESTS += buck genrule
+# do not run these two tests in parallel otherwise Buck has a bad time
+build_genrule_test: build_buck_test
+build_genrule_print: build_buck_print
 endif
 ifneq ($(MVN),no)
 BUILD_SYSTEMS_TESTS += mvn
@@ -84,7 +86,10 @@ endif
 endif
 
 ifeq ($(BUILD_C_ANALYZERS)+$(BUILD_JAVA_ANALYZERS),yes+yes)
-BUILD_SYSTEMS_TESTS += make utf8_in_pwd
+BUILD_SYSTEMS_TESTS += make utf8_in_pwd waf
+# the waf test and the make test run the same `make` command
+build_waf_test: build_make_test
+build_waf_print: build_make_print
 endif
 
 .PHONY: all
@@ -252,14 +257,6 @@ $(DIRECT_TESTS:%=direct_%_replace): infer
 .PHONY: direct_tests
 direct_tests: $(DIRECT_TESTS:%=direct_%_test)
 
-# do not run these two tests in parallel otherwise Buck has a bad time
-build_genrule_test: build_buck_test
-build_genrule_print: build_buck_print
-
-# the waf test and the make test run the same `make` command
-build_waf_test: build_make_test
-build_waf_print: build_make_print
-
 .PHONY: $(BUILD_SYSTEMS_TESTS:%=build_%_test)
 $(BUILD_SYSTEMS_TESTS:%=build_%_test): infer
 	$(QUIET)$(call silent_on_success,Running $(subst _, ,$@),\