Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-06-05 17:10:41 -0400
committerDavid Williams2013-06-05 17:10:41 -0400
commitcd1859200fae4ec55ed4fd09e0490059e454078c (patch)
treec196f3da4b421b03f9b36431f2aebfee9f32333d
parent59d3a9477adf8ce4cd99910c4fb571d6845233f4 (diff)
downloadeclipse.platform.releng.aggregator-cd1859200fae4ec55ed4fd09e0490059e454078c.tar.gz
eclipse.platform.releng.aggregator-cd1859200fae4ec55ed4fd09e0490059e454078c.tar.xz
eclipse.platform.releng.aggregator-cd1859200fae4ec55ed4fd09e0490059e454078c.zip
Bug 409817 - All API Tools reports are missing
corrected error checking, which itself was leaving an error.
-rwxr-xr-xproduction/build-functions.shsource3
-rw-r--r--production/master-build.sh2
2 files changed, 2 insertions, 3 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
index 518d0a2e..a520c8d4 100755
--- a/production/build-functions.shsource
+++ b/production/build-functions.shsource
@@ -15,8 +15,7 @@ checkNArgs ()
#echo " DEBUG checkNArgs bashLineNo[1]: ${BASH_LINENO[1]}" >> ${TRACE_OUTPUT}
if [[ $actual != $expected ]]
then
- buildDirectory=$( fn-build-dir "$ROOT" "$BUILD_ID" "$STREAM" )
- mkdir -p "${buildDirectory}"
+ # depends on buildDirectory being exported
BUILD_FAILED="${buildDirectory}/buildFailed-program-error"
echo "PROGRAM ERROR: expected $expected arguments but was passed $actual." >${BUILD_FAILED}
echo " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}." >>${BUILD_FAILED}
diff --git a/production/master-build.sh b/production/master-build.sh
index 50984fb8..e6d3bf68 100644
--- a/production/master-build.sh
+++ b/production/master-build.sh
@@ -32,7 +32,7 @@ buildrc=0
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
+export buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
if [[ -z "${buildDirectory}" ]]
then
echo "PROGRAM ERROR: buildDirectory returned from fn-build-dir was empty"

Back to the top