add additional_src_directories flag

PicnicSupermarket · Jan 10, 2024 · f16db40 · f16db40
1 parent 88cf5e4
commit f16db40
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/integration-tests/checkstyle-10.12.4.sh b/integration-tests/checkstyle-10.12.4.sh
@@ -16,5 +16,6 @@ report_directory="$([ "${#}" = 0 ] || ([ -z "${do_sync}" ] && echo "${1}") || ([
 # XXX: Configure Renovate to manage the AssertJ version declared here.
 build_flags="-Dassertj.version=3.24.2"
 validation_mvn_flags="-Dtest=!MetadataGeneratorUtilTest#metadataFilesGenerationAllFiles,!XdocsJavaDocsTest#allCheckSectionJavaDocs" 
+additional_src_directories="\${project.basedir}\${file.separator}src\${file.separator}it\${file.separator}java,\${project.basedir}\${file.separator}src\${file.separator}xdocs-examples\${file.separator}java"
 
-"$(dirname ${0})"/integration-test.sh "$test_name" "$project" "$repository" "$revision" "$build_flags" "" "" "$validation_mvn_flags" "$do_sync" "$report_directory" 
+"$(dirname ${0})"/integration-test.sh "$test_name" "$project" "$repository" "$revision" "$build_flags" "$additional_src_directories" "" "$validation_mvn_flags" "$do_sync" "$report_directory" 
diff --git a/integration-tests/integration-test.sh b/integration-tests/integration-test.sh
@@ -8,8 +8,8 @@ integration_test_root="$(readlink -f "$(dirname "${0}")")"
 error_prone_support_root="${integration_test_root}/.."
 repos_root="${integration_test_root}/.repos"
 
-if [ "${#}" -ne 10 ]; then
-  >&2 echo "Usage $(basename "${0}") [TestName] [Project] [Repository] [Revision] [BuildFlags] [PatchFlags] [ValidationEpFlags] [ValidationMvnFlags] [DoSync] [ReportDirectory]"
+if [ "${#}" -ne 11 ]; then
+  >&2 echo "Usage $(basename "${0}") [TestName] [Project] [Repository] [Revision] [BuildFlags] [AdditionalSourceDirectories] [PatchFlags] [ValidationEpFlags] [ValidationMvnFlags] [DoSync] [ReportDirectory]"
   exit 1
 fi
 
@@ -18,11 +18,12 @@ project="${2}"
 repository="${3}"
 revision="${4}"
 build_flags="${5}"
-patch_flags="${6}"
-validation_ep_flags="${7}"
-validation_mvn_flags="${8}"
-do_sync="${9}"
-report_directory="${10}"
+additional_src_directories="${6}"
+patch_flags="${7}"
+validation_ep_flags="${8}"
+validation_mvn_flags="${9}"
+do_sync="${10}"
+report_directory="${11}"
 
 if [ -n "${report_directory}" ]; then
   mkdir -p "${report_directory}"
@@ -40,7 +41,7 @@ shared_build_flags="
   -Derror-prone-support.version=$(
     mvn -f "${error_prone_support_root}" help:evaluate -Dexpression=project.version -q -DforceStdout
   )
-  -DadditionalSourceDirectories=\${project.basedir}\${file.separator}src\${file.separator}it\${file.separator}java,\${project.basedir}\${file.separator}src\${file.separator}xdocs-examples\${file.separator}java
+  -DadditionalSourceDirectories=${additional_src_directories}
   ${build_flags}
   "
 

diff --git a/integration-tests/metrics-v4.2.19.sh b/integration-tests/metrics-v4.2.19.sh
@@ -18,4 +18,4 @@ report_directory="$([ "${#}" = 0 ] || ([ -z "${do_sync}" ] && echo "${1}") || ([
 # as they introduce changes that expect guava to be on the classpath.
 patch_flags="-Xep:CollectorMutability:OFF -XepOpt:Refaster:NamePattern=^((?!(Immutable|Preconditions|StringRules\.StringIsNullOrEmpty)).*)"
 
-"$(dirname ${0})"/integration-test.sh "$test_name" "$project" "$repository" "$revision" "" "${patch_flags}" "" "" "$do_sync" "$report_directory" 
+"$(dirname ${0})"/integration-test.sh "$test_name" "$project" "$repository" "$revision" "" "" "${patch_flags}" "" "" "$do_sync" "$report_directory"