Skip to content

Commit

Permalink
[build] fix clang and java-only tests
Browse files Browse the repository at this point in the history
Summary: The tests wouldn't pass in clang-only or Java-only mode.

Reviewed By: mbouaziz

Differential Revision: D5498555

fbshipit-source-id: 8e49b8d
  • Loading branch information
jvillard authored and facebook-github-bot committed Jul 28, 2017
1 parent 4792e37 commit fa1c89a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 7 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -77,14 +76,20 @@ 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
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
Expand Down Expand Up @@ -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 _, ,$@),\
Expand Down

0 comments on commit fa1c89a

Please sign in to comment.