From e7efc38eb0736517a4c32acb07d24c48deef6d2a Mon Sep 17 00:00:00 2001
From: Artem Pianykh <arr@fb.com>
Date: Wed, 14 Apr 2021 01:20:51 -0700
Subject: [PATCH] [ci] Use Java 11 version of Buck in tests

Reviewed By: ezgicicek

Differential Revision: D27734182

fbshipit-source-id: c3084ca66
---
 .gitignore                                             |  3 ++-
 Makefile                                               |  3 ++-
 configure.ac                                           | 10 +++++++---
 infer/tests/build_systems/buck_blacklist/.buck-java11  |  1 +
 infer/tests/build_systems/buck_blacklist/.buck-java8   |  1 -
 .../build_systems/buck_blacklist/.buckjavaversion      |  1 +
 .../buck_clang_test_determinator/.buck-java11          |  1 +
 .../buck_clang_test_determinator/.buck-java8           |  1 -
 .../buck_clang_test_determinator/.buckjavaversion      |  1 +
 .../buck_export_changed_functions/.buck-java11         |  1 +
 .../buck_export_changed_functions/.buck-java8          |  1 -
 .../buck_export_changed_functions/.buckjavaversion     |  1 +
 infer/tests/build_systems/buck_flavors/.buck-java11    |  1 +
 infer/tests/build_systems/buck_flavors/.buck-java8     |  1 -
 .../tests/build_systems/buck_flavors/.buckjavaversion  |  1 +
 .../buck_flavors_deterministic/.buck-java11            |  1 +
 .../buck_flavors_deterministic/.buck-java8             |  1 -
 .../buck_flavors_deterministic/.buckjavaversion        |  1 +
 .../tests/build_systems/buck_flavors_diff/.buck-java11 |  1 +
 .../tests/build_systems/buck_flavors_diff/.buck-java8  |  1 -
 .../build_systems/buck_flavors_diff/.buckjavaversion   |  1 +
 .../tests/build_systems/buck_flavors_run/.buck-java11  |  1 +
 infer/tests/build_systems/buck_flavors_run/.buck-java8 |  1 -
 .../build_systems/buck_flavors_run/.buckjavaversion    |  1 +
 .../tests/build_systems/buck_java_flavor/.buck-java11  |  1 +
 infer/tests/build_systems/buck_java_flavor/.buck-java8 |  1 -
 .../build_systems/buck_java_flavor/.buckjavaversion    |  1 +
 infer/tests/build_systems/codetoanalyze/.buck-java11   |  1 +
 infer/tests/build_systems/codetoanalyze/.buck-java8    |  1 -
 .../tests/build_systems/codetoanalyze/.buckjavaversion |  1 +
 30 files changed, 29 insertions(+), 14 deletions(-)
 create mode 120000 infer/tests/build_systems/buck_blacklist/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_blacklist/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_blacklist/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_clang_test_determinator/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_export_changed_functions/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_export_changed_functions/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_flavors/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_flavors/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_flavors/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_flavors_deterministic/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_flavors_diff/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_flavors_diff/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_flavors_diff/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_flavors_run/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_flavors_run/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_flavors_run/.buckjavaversion
 create mode 120000 infer/tests/build_systems/buck_java_flavor/.buck-java11
 delete mode 120000 infer/tests/build_systems/buck_java_flavor/.buck-java8
 create mode 120000 infer/tests/build_systems/buck_java_flavor/.buckjavaversion
 create mode 120000 infer/tests/build_systems/codetoanalyze/.buck-java11
 delete mode 120000 infer/tests/build_systems/codetoanalyze/.buck-java8
 create mode 120000 infer/tests/build_systems/codetoanalyze/.buckjavaversion

diff --git a/.gitignore b/.gitignore
index 199e51087..6f2edc8f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,8 @@ duplicates.txt
 /configure
 /Makefile.autoconf
 /.buckversion
-/.buck-java8
+/.buck-java11
+/.buckjavaversion
 /*/.gitignore
 /*/*/.gitignore
 
diff --git a/Makefile b/Makefile
index d8d566c5e..9ace8c9a6 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/configure.ac b/configure.ac
index 15927de75..62bf8d019 100644
--- 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])
diff --git a/infer/tests/build_systems/buck_blacklist/.buck-java11 b/infer/tests/build_systems/buck_blacklist/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_blacklist/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_blacklist/.buck-java8 b/infer/tests/build_systems/buck_blacklist/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_blacklist/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_blacklist/.buckjavaversion b/infer/tests/build_systems/buck_blacklist/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_blacklist/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java11 b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8 b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion b/infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_export_changed_functions/.buck-java11 b/infer/tests/build_systems/buck_export_changed_functions/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_export_changed_functions/.buck-java8 b/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion b/infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors/.buck-java11 b/infer/tests/build_systems/buck_flavors/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors/.buck-java8 b/infer/tests/build_systems/buck_flavors/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_flavors/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors/.buckjavaversion b/infer/tests/build_systems/buck_flavors/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java11 b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8 b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion b/infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_diff/.buck-java11 b/infer/tests/build_systems/buck_flavors_diff/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_diff/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_diff/.buck-java8 b/infer/tests/build_systems/buck_flavors_diff/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_flavors_diff/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_diff/.buckjavaversion b/infer/tests/build_systems/buck_flavors_diff/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_diff/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_run/.buck-java11 b/infer/tests/build_systems/buck_flavors_run/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_run/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_run/.buck-java8 b/infer/tests/build_systems/buck_flavors_run/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_flavors_run/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_flavors_run/.buckjavaversion b/infer/tests/build_systems/buck_flavors_run/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_flavors_run/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_java_flavor/.buck-java11 b/infer/tests/build_systems/buck_java_flavor/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/buck_java_flavor/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_java_flavor/.buck-java8 b/infer/tests/build_systems/buck_java_flavor/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/buck_java_flavor/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/buck_java_flavor/.buckjavaversion b/infer/tests/build_systems/buck_java_flavor/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/buck_java_flavor/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file
diff --git a/infer/tests/build_systems/codetoanalyze/.buck-java11 b/infer/tests/build_systems/codetoanalyze/.buck-java11
new file mode 120000
index 000000000..d5a198186
--- /dev/null
+++ b/infer/tests/build_systems/codetoanalyze/.buck-java11
@@ -0,0 +1 @@
+../../../../.buck-java11
\ No newline at end of file
diff --git a/infer/tests/build_systems/codetoanalyze/.buck-java8 b/infer/tests/build_systems/codetoanalyze/.buck-java8
deleted file mode 120000
index fc94e0dec..000000000
--- a/infer/tests/build_systems/codetoanalyze/.buck-java8
+++ /dev/null
@@ -1 +0,0 @@
-../../../../.buck-java8
\ No newline at end of file
diff --git a/infer/tests/build_systems/codetoanalyze/.buckjavaversion b/infer/tests/build_systems/codetoanalyze/.buckjavaversion
new file mode 120000
index 000000000..2ec14ae94
--- /dev/null
+++ b/infer/tests/build_systems/codetoanalyze/.buckjavaversion
@@ -0,0 +1 @@
+../../../../.buckjavaversion
\ No newline at end of file