[ci] Use Java 11 version of Buck in tests

Reviewed By: ezgicicek Differential Revision: D27734182 fbshipit-source-id: c3084ca66
4 years ago · e7efc38eb0
parent 9a2768d66d
commit e7efc38eb0
30 changed files with 29 additions and 14 deletions
--- a/.gitignore
+++ b/.gitignore
@ -74,7 +74,8 @@ duplicates.txt
 /configure
 /Makefile.autoconf
 /.buckversion
-/.buck-java8
+/.buck-java11
+/.buckjavaversion
 /*/.gitignore
 /*/*/.gitignore

--- a/3
+++ b/3
@ -830,7 +830,8 @@ endif

 .PHONY: conf-clean
 conf-clean: clean
-	$(REMOVE) .buck-java8
+	$(REMOVE) .buckjavaversion
+	$(REMOVE) .buck-java11
 	$(REMOVE) Makefile.autoconf
 	$(REMOVE) acinclude.m4
 	$(REMOVE) aclocal.m4
--- a/configure.ac
+++ b/configure.ac
@ -337,9 +337,13 @@ AC_SUBST([ENABLE_OCAML_BINANNOT])

 # We use Buck to run the Infer tests
 AS_IF([test x"$is_facebook_tree" = x"yes"],
-  AC_MSG_CHECKING([which .buck-java8 to use])
-  cp "facebook/dependencies/dotbuck-java8" ".buck-java8"
-  AC_MSG_RESULT([facebook/dependencies/dotbuck-java8]))
+  AC_MSG_CHECKING([which .buckjavaversion to use])
+  cp "facebook/dependencies/dotbuckjavaversion" ".buckjavaversion"
+  AC_MSG_RESULT([facebook/dependencies/dotbuckjavaversion])
+
+  AC_MSG_CHECKING([which .buck-java11 to use])
+  cp "facebook/dependencies/dotbuck-java11" ".buck-java11"
+  AC_MSG_RESULT([facebook/dependencies/dotbuck-java11]))


 AC_CHECK_TOOL([GETCONF], [getconf], [no])
--- a/infer/tests/build_systems/buck_blacklist/.buck-java11
+++ b/infer/tests/build_systems/buck_blacklist/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_blacklist/.buck-java8
+++ b/infer/tests/build_systems/buck_blacklist/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_blacklist/.buckjavaversion
+++ b/infer/tests/build_systems/buck_blacklist/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java11
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_export_changed_functions/.buck-java11
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_flavors/.buck-java11
+++ b/infer/tests/build_systems/buck_flavors/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_flavors/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors/.buckjavaversion
+++ b/infer/tests/build_systems/buck_flavors/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java11
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_flavors_diff/.buck-java11
+++ b/infer/tests/build_systems/buck_flavors_diff/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_flavors_diff/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_diff/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_diff/.buckjavaversion
+++ b/infer/tests/build_systems/buck_flavors_diff/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_flavors_run/.buck-java11
+++ b/infer/tests/build_systems/buck_flavors_run/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_flavors_run/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_run/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_run/.buckjavaversion
+++ b/infer/tests/build_systems/buck_flavors_run/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/buck_java_flavor/.buck-java11
+++ b/infer/tests/build_systems/buck_java_flavor/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/buck_java_flavor/.buck-java8
+++ b/infer/tests/build_systems/buck_java_flavor/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/buck_java_flavor/.buckjavaversion
+++ b/infer/tests/build_systems/buck_java_flavor/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion
--- a/infer/tests/build_systems/codetoanalyze/.buck-java11
+++ b/infer/tests/build_systems/codetoanalyze/.buck-java11
@ -0,0 +1 @@
+../../../../.buck-java11
--- a/infer/tests/build_systems/codetoanalyze/.buck-java8
+++ b/infer/tests/build_systems/codetoanalyze/.buck-java8
@ -1 +0,0 @@
-../../../../.buck-java8
--- a/infer/tests/build_systems/codetoanalyze/.buckjavaversion
+++ b/infer/tests/build_systems/codetoanalyze/.buckjavaversion
@ -0,0 +1 @@
+../../../../.buckjavaversion