Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-02-01 23:17:28 -0500
committerDavid Williams2013-02-01 23:17:28 -0500
commit62c3d44e2a41fe86b643160d0d48841061e9f51d (patch)
tree1c689bc552f4da15812720a76b94dcb3d46154f1
parentb313336a00878bc087148edb5dfb729db9a35552 (diff)
downloadeclipse.platform.releng.aggregator-62c3d44e2a41fe86b643160d0d48841061e9f51d.tar.gz
eclipse.platform.releng.aggregator-62c3d44e2a41fe86b643160d0d48841061e9f51d.tar.xz
eclipse.platform.releng.aggregator-62c3d44e2a41fe86b643160d0d48841061e9f51d.zip
Bug 394293 - [CBI] launch the tests
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml3
-rw-r--r--[-rwxr-xr-x]production/build-functions.sh19
2 files changed, 20 insertions, 2 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
index 5f85ab071..4f10261db 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/pom.xml
@@ -29,7 +29,8 @@
</properties>
<!--
- igorf: I *guess* junit-tests is built by PDE/Build from org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests
+ igorf: I *guess* junit-tests is built by PDE/Build from org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests
+ davidw: Yes.
-->
<build>
diff --git a/production/build-functions.sh b/production/build-functions.sh
index 1d8a5b26a..ed5558a07 100755..100644
--- a/production/build-functions.sh
+++ b/production/build-functions.sh
@@ -801,11 +801,28 @@ fn-publish-eclipse ()
REPO_DIR="$1"; shift
BUILD_DIR="$1"; shift
BASEBUILDER_LAUNCHER="$1"; shift
+
+ # We make a copy of the tychoeclipsebuilder/eclipse files to the BUILD_DIR for use, partially
+ # in case we ever do builds in parallel (unlikely) but mostly so that the same files used during
+ # the build, will be there, and be available during the test publishing phase, which has a higher
+ # probability of overlapping with another build starting, and we don't want one stepping on the files
+ # from the other. We do, though, need to remember not to rsync that directory to "downloads".
+ # NOTE: assuming for now we do not really use the 'eclipse.build.configs' parameter
+ # at least as "build.configs" ... we just use it as anchor to find other locations,
+ # so might have to adjust some "../" relative references to "../../" if there is
+ # not a more direct way to do it using absolute paths (and, there should be,
+ # perhaps use $aggrDir and make copies from here, again to make "publish area"
+ # more independent of current/future contents of gitCache. Or, better, use
+ # publishingContent, which is definitely source of content to copy from.
+ PUBLISHING_FILES_DIR=$BUILD_DIR/eclipse.platform.releng.tychoeclipsebuilder/eclipse
+ mkdir -p ${PUBLISHING_FILES_DIR}
+ rsync -r $REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/* ${PUBLISHING_FILES_DIR}
+
pushd "$BUILD_DIR"
java -jar "$BASEBUILDER_LAUNCHER" \
-application org.eclipse.ant.core.antRunner \
-v \
- -buildfile "$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml \
+ -buildfile "${PUBLISHING_FILES_DIR}/helper.xml" \
-Declipse.build.configs="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder \
-DbuildId="$BUILD_ID" \
-DbuildRepo="$REPO_DIR"/eclipse.platform.repository/target/repository \

Back to the top