Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2016-11-01 17:02:29 +0000
committerStephan Herrmann2016-11-22 18:21:45 +0000
commit1b6878ec52340e6a4d7399285d4827e45d7f6290 (patch)
tree9c0a72677e131ac8c027b02d13154a8a0228a52c
parenteae48b5c3675029aa959e1c438fe761d22578d58 (diff)
downloadorg.eclipse.objectteams-1b6878ec52340e6a4d7399285d4827e45d7f6290.tar.gz
org.eclipse.objectteams-1b6878ec52340e6a4d7399285d4827e45d7f6290.tar.xz
org.eclipse.objectteams-1b6878ec52340e6a4d7399285d4827e45d7f6290.zip
Releng: HIPP: Store paths in scripts, not Jobs
- allow overriding of base SDK coordinates - remove "-" cli switches - more cleanup / docu
-rw-r--r--releng/build-scripts/build/otdt_prerequisites-hipp.sh6
-rwxr-xr-xreleng/build-scripts/build/otdt_runtests-hipp.sh41
2 files changed, 17 insertions, 30 deletions
diff --git a/releng/build-scripts/build/otdt_prerequisites-hipp.sh b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
index b3a3756fd..95026c26a 100644
--- a/releng/build-scripts/build/otdt_prerequisites-hipp.sh
+++ b/releng/build-scripts/build/otdt_prerequisites-hipp.sh
@@ -52,14 +52,14 @@ NICE="10"
# VERSIONS:
# Eclipse SDK build identifier (used for substitution in otdt.map.in etc.):
-SDK_QUALIFIER=I20161027-0700
+SDK_QUALIFIER=${SDK_QUALIFIER:="I20161027-0700"}
# Architecture (as used by OSGi):
ARCH=`arch`
# used only locally (components of the ECLIPSE_SDK_TGZ path):
-EVERSION=I20161027-0700
-DROP=${DROPS4}/I20161027-0700
+EVERSION=${EVERSION:="I20161027-0700"}
+DROP=${DROPS4}/${DROP:="I20161027-0700"}
# EXPORT: archive file of the base eclipse SDK build:
ECLIPSE_SDK_TGZ=${DROP}/eclipse-SDK-${EVERSION}-linux-gtk-${ARCH}.tar.gz
diff --git a/releng/build-scripts/build/otdt_runtests-hipp.sh b/releng/build-scripts/build/otdt_runtests-hipp.sh
index 185225951..b1bbdad0d 100755
--- a/releng/build-scripts/build/otdt_runtests-hipp.sh
+++ b/releng/build-scripts/build/otdt_runtests-hipp.sh
@@ -23,6 +23,8 @@
# ECLIPSE_SDK_TGZ archive file of the base eclipse SDK build (full path)
# ECLIPSE_TESTLIB_ZIP archive file of the eclipse test framework (full path)
# PUBLISHED_UPDATES directory of previously published plugins&features
+# FETCH_CACHE_LOCATION git working area holding caches for fetch
+# MAP_FILE_PATH path to the otdt.map file (original location of otdt.map.in)
# ANT_PROFILE configure the ant process
# NICE niceness value for nice -n ${NICE}
# =============================================================================
@@ -38,6 +40,9 @@
## -Dpublished.updates path to previously published things
## -Ddo.build.all true|false: should OTDT and tests be built?
## -Ddo.run.tests true|false: should test be run?
+## -DfetchCacheLocation git working area holding caches for fetch
+## -Dmap.file.path path to the otdt.map file (original location of otdt.map.in)
+## -D_hasSaxon.jar to prevent copying of saxon8.jar (was needed on build.eclipse.org)
# =============================================================================
usage()
@@ -90,35 +95,16 @@ DO_BUILD="true"
#LOCAL: should the tests be run?
DO_RUN="true"
-
-while test $# -gt 0; do
- case "$1" in
- -b)
- MAIN_TARGET="ot-junit-build"
- DO_RUN="false"
- shift
- ;;
- -nobuild)
+case ${MAIN_TARGET} in
+ "ot-junit-run")
DO_BUILD="false"
- shift
;;
- -tmp)
- shift
- TEST_TMPDIR="$1"
- shift
- ;;
- *)
- echo "Unknown argument: $1"
- usage
- exit 1
- esac
-
-done
-
-if [ "${MAIN_TARGET}" == "ot-junit-run" ]
-then
- DO_BUILD="false"
-fi
+ "ot-compiler-build")
+ ;&
+ "ot-junit-build")
+ DO_RUN="false"
+ ;;
+esac
# start working:
@@ -135,6 +121,7 @@ then
rm -rf updateSiteTests
rm -rf updateSiteCompiler
rm -rf metadata
+ rm -rf ecj
else
rm -f test-root/eclipse/results/*
fi

Back to the top