From a7fdb096007ab8080398c571fe2aee04b000ab07 Mon Sep 17 00:00:00 2001
From: Jules Villard <jul@fb.com>
Date: Wed, 15 Jun 2016 05:48:47 -0700
Subject: [PATCH] add quick-test target

Reviewed By: jberdine

Differential Revision: D3436716

fbshipit-source-id: 8bfb530
---
 Makefile           | 21 ++++++++++++---------
 Makefile.config.in |  6 ++++++
 infer/src/Makefile |  1 -
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 7e7d4ffb5..62d3b938e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,17 +27,18 @@ $(INFER_BIN_RELPATH) $(INFERTRACEBUGS_BIN_RELPATH):
 	 cd $(@D) && \
 	 $(LN_S) ../lib/python/$(@F) $(@F))
 
-infer: $(INFER_BIN_RELPATH)
+src_build:
 	$(MAKE) -C $(SRC_DIR) infer
+ifeq ($(BUILD_C_ANALYZERS),yes)
+src_build: clang_plugin
+endif
+
+infer: $(INFER_BIN_RELPATH) src_build
 ifeq ($(BUILD_JAVA_ANALYZERS),yes)
 	$(MAKE) -C $(ANNOTATIONS_DIR)
 endif
 	$(MAKE) -C $(MODELS_DIR) all
 
-ifeq ($(BUILD_C_ANALYZERS),yes)
-infer: clang_plugin
-endif
-
 clang_setup:
 	export CC="$(CC)" CFLAGS="$(CFLAGS)"; \
 	export CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)"; \
@@ -77,8 +78,8 @@ ifeq ($(IS_FACEBOOK_TREE),yes)
 test_build: test_oss_build
 endif
 
-ocaml_unit_test: infer
-	$(INFERUNIT_BIN)
+ocaml_unit_test: test_this_build
+	$(TEST_BUILD_DIR)/unit/inferunit.byte
 
 buck_test: infer
 	NO_BUCKD=1 buck clean
@@ -116,6 +117,8 @@ test: test_build ocaml_unit_test buck_test inferTraceBugs_test
 test_xml: test_build ocaml_unit_test buck_test_xml inferTraceBugs_test
 	$(MAKE) -C $(SRC_DIR) mod_dep.dot
 
+quick-test: test_this_build ocaml_unit_test
+
 uninstall:
 	$(REMOVE_DIR) $(DESTDIR)$(libdir)/infer/
 	$(REMOVE) $(DESTDIR)$(bindir)/inferTraceBugs
@@ -245,5 +248,5 @@ conf-clean: clean
 	$(REMOVE_DIR) infer/models/objc/out/
 
 .PHONY: all buck_test buck_test_xml clean clang_plugin clang_setup infer inferTraceBugs
-.PHONY: inferTraceBugs_test ocaml_unit_test check_missing_mli test test_xml test_build install
-.PHONY: uninstall
+.PHONY: inferTraceBugs_test install ocaml_unit_test check_missing_mli src_build test test_xml
+.PHONY: test_build uninstall
diff --git a/Makefile.config.in b/Makefile.config.in
index 07b52c02d..de7be4c04 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -70,10 +70,16 @@ FCP_CLANG_OCAML_DIR = $(FCP_DIR)/clang-ocaml
 ANNOTATIONS_DIR = $(INFER_DIR)/annotations
 BIN_DIR = $(INFER_DIR)/bin
 BUILD_DIR = $(INFER_DIR)/_build
+ETC_DIR = $(INFER_DIR)/etc
 LIB_DIR = $(INFER_DIR)/lib
 MODELS_DIR = $(INFER_DIR)/models
 SRC_DIR = $(INFER_DIR)/src
 
+ANNOT_DIR = $(SRC_DIR)/_build
+INFER_BUILD_DIR = $(BUILD_DIR)/infer
+LLVM_BUILD_DIR = $(BUILD_DIR)/llvm
+TEST_BUILD_DIR = $(BUILD_DIR)/test
+
 JAVA_LIB_DIR = $(LIB_DIR)/java
 SPECS_LIB_DIR = $(LIB_DIR)/specs
 
diff --git a/infer/src/Makefile b/infer/src/Makefile
index c1870a708..fcfc5db48 100644
--- a/infer/src/Makefile
+++ b/infer/src/Makefile
@@ -11,7 +11,6 @@ include $(ROOT_DIR)/Makefile.config
 #### Global declarations ####
 
 INFER_BUILD_DIR = $(BUILD_DIR)/infer
-TEST_BUILD_DIR = $(BUILD_DIR)/test
 LLVM_BUILD_DIR = $(BUILD_DIR)/llvm
 ANNOT_DIR = $(SRC_DIR)/_build
 ETC_DIR = $(INFER_DIR)/etc