add test target

Summary:
public
`make test` now runs the e2e tests.

Reviewed By: jeremydubreil

Differential Revision: D2754740

fb-gh-sync-id: 9f80815

Makefile.config.in

@@ -34,6 +34,15 @@ INFERCLANG_BIN = $(BIN_DIR)/InferClang
 INFERJAVA_BIN = $(BIN_DIR)/InferJava
 INFERPRINT_BIN = $(BIN_DIR)/InferPrint
 
+INFER_ANALYZERS=
+ifeq (@BUILD_C_ANALYZERS@,yes)
+INFER_ANALYZERS+=clang
+endif
+ifeq (@BUILD_JAVA_ANALYZERS@,yes)
+INFER_ANALYZERS+=java
+endif
+
+
 JAVA_DEPS = $(addprefix $(PYTHON_LIB_DIR)/, \
               analyze.py config.py issues.py jwlib.py source.py utils.py) \
             $(addprefix $(CAPTURE_LIB_DIR)/, javac.py util.py) \

Makefile.in

@@ -9,15 +9,19 @@
 ROOT_DIR = .
 include $(ROOT_DIR)/Makefile.config
 
-all:
-
+TARGETS_TO_TEST=
+ifeq (@BUILD_C_ANALYZERS@,yes)
+TARGETS_TO_TEST += c cpp
+endif
 ifeq (@BUILD_JAVA_ANALYZERS@,yes)
-all: java
+TARGETS_TO_TEST += java
 endif
-
-ifeq (@BUILD_C_ANALYZERS@,yes)
-all: clang
+ifneq (@XCODE_SELECT@,no)
+TARGETS_TO_TEST += objc
 endif
+TARGETS_TO_TEST := $(shell echo $(TARGETS_TO_TEST))
+
+all: $(INFER_ANALYZERS)
 
 ifneq (@BUILD_JAVA_ANALYZERS@,yes)
 java:
@@ -70,9 +74,30 @@ clang: clang_plugin
 	$(MAKE) -C $(INFER_DIR) clang
 endif
 
+buck_test: $(INFER_ANALYZERS)
+	NO_BUCKD=1 buck clean
+	NO_BUCKD=1 buck test $(TARGETS_TO_TEST)
+
+buck_test_xml: $(INFER_ANALYZERS)
+	NO_BUCKD=1 buck clean
+	NO_BUCKD=1 buck test --xml test.xml $(TARGETS_TO_TEST)
+
+build_integration_tests: $(INFER_ANALYZERS)
+	./scripts/build_integration_tests.py
+
+test: buck_test
+
+test_xml: buck_test_xml
+
+ifeq (@BUILD_JAVA_ANALYZERS@,yes)
+test: build_integration_tests
+test_xml: build_integration_tests
+endif
+
 clean:
+	@rm -fv test.xml
 	$(MAKE) -C $(FCP_DIR) clean
 	$(MAKE) -C $(FCP_DIR)/clang-ocaml clean
 	$(MAKE) -C $(INFER_DIR) clean
 
-.PHONY: all clean clang clang_plugin clang_setup java
+.PHONY: all build_integration_tests clean clang clang_plugin clang_setup java test test_xml

scripts/test.sh

@@ -12,43 +12,10 @@ set -x
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 INFER_DIR="$SCRIPT_DIR/.."
-INFER_BIN="$INFER_DIR/infer/bin"
 
+XML=
 if [ "$1" == "--xml" ]; then
-    XML="--xml test.xml"
+    XML="_xml"
 fi
 
-TARGETS_TO_COMPILE=()
-TARGETS_TO_TEST=()
-if [ -e "$INFER_BIN/InferJava" ]; then
-    TARGETS_TO_COMPILE+=('java')
-    TARGETS_TO_TEST+=('java')
-fi
-
-platform=`uname`
-if [ -e "$INFER_BIN/InferClang" ]; then
-    TARGETS_TO_COMPILE+=('clang')
-    TARGETS_TO_TEST+=('c' 'cpp')
-    if command -v xcode-select > /dev/null; then
-        TARGETS_TO_TEST+=('objc')
-    fi
-fi
-
-# We must collect at least one target, or Infer must be recompiled
-([ -z "$TARGETS_TO_TEST" ] || [ -z "$TARGETS_TO_COMPILE" ]) \
-  && echo 'Infer is not compiled properly. Run make clean all' \
-  && exit 1
-
-cd $SCRIPT_DIR/..
-make ${TARGETS_TO_COMPILE[@]}
-
-# Must clean in order to force running the tests with the latest version
-# of infer. There is no dependency between buck targets and infer.
-buck clean
-rm -rf test.xml
-
-buck test ${TARGETS_TO_TEST[@]} $XML || exit 1
-
-if [ -e "$INFER_BIN/InferJava" ]; then
-    ./scripts/build_integration_tests.py
-fi
+make -C "$INFER_DIR" test$XML