You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2019/08/26 14:22:35 UTC
[lucene-solr] 01/03: SOLR-13452: Finish this rename properly.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch jira/SOLR-13452_gradle_5
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit f74c67c5b6533929417d66a803fab0257457447f
Author: markrmiller <mi...@apple.com>
AuthorDate: Mon Aug 26 09:03:08 2019 -0500
SOLR-13452: Finish this rename properly.
---
buildSrc/build-wdocker-test/start.sh | 2 +-
buildSrc/build-wdocker-test/test-build.sh | 2 +-
buildSrc/build-wdocker-test/test-check-sources.sh | 2 +-
buildSrc/build-wdocker-test/test-rat-sources.sh | 2 +-
buildSrc/build-wdocker-test/test-scipts-for-test.sh | 2 +-
buildSrc/src/buildTest/java/BaseTestClass.java | 4 ++--
buildSrc/src/buildTest/java/TestBuild.java | 2 +-
buildSrc/src/buildTest/java/TestChecks.java | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/buildSrc/build-wdocker-test/start.sh b/buildSrc/build-wdocker-test/start.sh
index 9add9d9..bc5c6a5 100644
--- a/buildSrc/build-wdocker-test/start.sh
+++ b/buildSrc/build-wdocker-test/start.sh
@@ -16,7 +16,7 @@
script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-. "test-build-wdocker/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
+. "build-wdocker-test/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
skip_build_image=""
diff --git a/buildSrc/build-wdocker-test/test-build.sh b/buildSrc/build-wdocker-test/test-build.sh
index 39a3e63..8242d8a 100644
--- a/buildSrc/build-wdocker-test/test-build.sh
+++ b/buildSrc/build-wdocker-test/test-build.sh
@@ -17,7 +17,7 @@
command -v docker >/dev/null 2>&1 || { echo "docker must be installed to run this test"; exit 1; }
# make any non 0 exit fail script
-. "test-build-wdocker/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
+. "build-wdocker-test/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
OPTIND=1 # Reset in case getopts has been used previously in the shell.
diff --git a/buildSrc/build-wdocker-test/test-check-sources.sh b/buildSrc/build-wdocker-test/test-check-sources.sh
index 8363f93..febc5c4 100644
--- a/buildSrc/build-wdocker-test/test-check-sources.sh
+++ b/buildSrc/build-wdocker-test/test-check-sources.sh
@@ -17,7 +17,7 @@
command -v docker >/dev/null 2>&1 || { echo "docker must be installed to run this test"; exit 1; }
# make any non 0 exit fail script
-. "test-build-wdocker/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
+. "build-wdocker-test/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
OPTIND=1 # Reset in case getopts has been used previously in the shell.
diff --git a/buildSrc/build-wdocker-test/test-rat-sources.sh b/buildSrc/build-wdocker-test/test-rat-sources.sh
index c367c9e..3d084ec 100644
--- a/buildSrc/build-wdocker-test/test-rat-sources.sh
+++ b/buildSrc/build-wdocker-test/test-rat-sources.sh
@@ -17,7 +17,7 @@
command -v docker >/dev/null 2>&1 || { echo "docker must be installed to run this test"; exit 1; }
# make any non 0 exit fail script
-. "test-build-wdocker/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
+. "build-wdocker-test/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
OPTIND=1 # Reset in case getopts has been used previously in the shell.
diff --git a/buildSrc/build-wdocker-test/test-scipts-for-test.sh b/buildSrc/build-wdocker-test/test-scipts-for-test.sh
index bbc6ad0..8d2663e 100644
--- a/buildSrc/build-wdocker-test/test-scipts-for-test.sh
+++ b/buildSrc/build-wdocker-test/test-scipts-for-test.sh
@@ -19,7 +19,7 @@
script_dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
# make any non 0 exit fail the script
-. "test-build-wdocker/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
+. "build-wdocker-test/setup-script-for-test.sh" || { echo "Could not source setup-script-for-test.sh"; exit 1; }
echo "won't fail"
diff --git a/buildSrc/src/buildTest/java/BaseTestClass.java b/buildSrc/src/buildTest/java/BaseTestClass.java
index 4532a94..c0bf831 100644
--- a/buildSrc/src/buildTest/java/BaseTestClass.java
+++ b/buildSrc/src/buildTest/java/BaseTestClass.java
@@ -48,7 +48,7 @@ public abstract class BaseTestClass extends Assert {
System.out.println("Exit:" + exitVal);
assumeTrue(exitVal == 0);
- cmd = new String[]{"bash", "test-build-wdocker/start.sh"};
+ cmd = new String[]{"bash", "build-wdocker-test/start.sh"};
exitVal = runCmd(cmd, env, false, false).returnCode;
if (exitVal > 0) {
fail("Failed starting docker containers!");
@@ -65,7 +65,7 @@ public abstract class BaseTestClass extends Assert {
@AfterClass
public static void tearDownAfterClass() throws Exception {
String[] cmd = new String[] {"bash",
- "test-build-wdocker/stop.sh"};
+ "build-wdocker-test/stop.sh"};
int exitVal = runCmd(cmd, env, false, false).returnCode;
if (exitVal > 0) {
fail("Failed stopping docker containers!");
diff --git a/buildSrc/src/buildTest/java/TestBuild.java b/buildSrc/src/buildTest/java/TestBuild.java
index 4ed26b7..ea64fdf 100644
--- a/buildSrc/src/buildTest/java/TestBuild.java
+++ b/buildSrc/src/buildTest/java/TestBuild.java
@@ -37,7 +37,7 @@ public class TestBuild extends BaseTestClass {
@Test
public void testBuild() throws Exception {
System.out.println("Start test-build.sh test in Docker container (" + env + ") ...");
- String[] cmd = new String[]{"bash", "test-build-wdocker/test-build.sh"};
+ String[] cmd = new String[]{"bash", "build-wdocker-test/test-build.sh"};
PbResult result = runCmd(cmd, env, false, false, false);
assertEquals("Testing test-build.sh failed", 0, result.returnCode);
}
diff --git a/buildSrc/src/buildTest/java/TestChecks.java b/buildSrc/src/buildTest/java/TestChecks.java
index 4bcdbb1..dbaeb41 100644
--- a/buildSrc/src/buildTest/java/TestChecks.java
+++ b/buildSrc/src/buildTest/java/TestChecks.java
@@ -49,7 +49,7 @@ public class TestChecks extends BaseTestClass {
@Test
public void testRatSources() throws Exception {
System.out.println("Start test-rat-sources.sh test in Docker container (" + env + ") ...");
- String[] cmd = new String[]{"bash", "test-build-wdocker/test-rat-sources.sh"};
+ String[] cmd = new String[]{"bash", "build-wdocker-test/test-rat-sources.sh"};
PbResult result = runCmd(cmd, env, false, false, false);
assertEquals("Testing test-rat-sources.sh failed", 0, result.returnCode);
}
@@ -57,7 +57,7 @@ public class TestChecks extends BaseTestClass {
@Test
public void testCheckSources() throws Exception {
System.out.println("Start test-check-sources.sh test in Docker container (" + env + ") ...");
- String[] cmd = new String[]{"bash", "test-build-wdocker/test-check-sources.sh"};
+ String[] cmd = new String[]{"bash", "build-wdocker-test/test-check-sources.sh"};
PbResult result = runCmd(cmd, env, false, false, false);
assertEquals("Testing test-check-sources.sh failed", 0, result.returnCode);
}