# HG changeset patch # User Jan Vrany # Date 1448390234 -3600 # Node ID d83cb4945d5eb11b8130ceaf31a72564e0b80979 # Parent f79944e2bd85f51f9cd01bb09739475ab69d8e10 Oops, forgot to export PETITCOMPILER_DATA_DIRECTORY variable ...so Smalltalk code could not read it. Also fixed test for "include" scripts so they are not downloaded again when already downloaded. diff -r f79944e2bd85 -r d83cb4945d5e ci/ci-common.sh --- a/ci/ci-common.sh Mon Nov 23 14:00:53 2015 +0100 +++ b/ci/ci-common.sh Tue Nov 24 19:37:14 2015 +0100 @@ -15,17 +15,18 @@ case $(uname -n) in swing-h-win64) - PETITCOMPILER_DATA_DIRECTORY="E:\\workspace\\petitcompiler_test_data" + export PETITCOMPILER_DATA_DIRECTORY="E:\\workspace\\petitcompiler_test_data" ;; swing-hudson-lin64) - PETITCOMPILER_DATA_DIRECTORY="/ws/workspace/petitcompiler_test_data" + export PETITCOMPILER_DATA_DIRECTORY="/ws/workspace/petitcompiler_test_data" ;; *) - PETITCOMPILER_DATA_DIRECTORY=test-data + export PETITCOMPILER_DATA_DIRECTORY=test-data ;; esac PETITCOMPILER_BENCHMARK_REPORT=benchmark-results-$BUILD_NUMBER.json + function ci_download_and_unzip_file { local url=$1 local where=$PETITCOMPILER_DATA_DIRECTORY @@ -87,4 +88,4 @@ -H 'Content-Type: application/json' \ --data "@$PETITCOMPILER_BENCHMARK_REPORT" fi -} \ No newline at end of file +} diff -r f79944e2bd85 -r d83cb4945d5e ci/ci-pharo-benchmark.sh --- a/ci/ci-pharo-benchmark.sh Mon Nov 23 14:00:53 2015 +0100 +++ b/ci/ci-pharo-benchmark.sh Tue Nov 24 19:37:14 2015 +0100 @@ -4,7 +4,7 @@ # set -e -if [ ! -x "ci-pharo-common.sh" ]; then +if [ ! -f "ci-pharo-common.sh" ]; then wget -O "ci-pharo-common.sh" https://bitbucket.org/janvrany/stx-goodies-petitparser/raw/tip/ci/ci-pharo-common.sh fi . ci-pharo-common.sh diff -r f79944e2bd85 -r d83cb4945d5e ci/ci-pharo-common.sh --- a/ci/ci-pharo-common.sh Mon Nov 23 14:00:53 2015 +0100 +++ b/ci/ci-pharo-common.sh Tue Nov 24 19:37:14 2015 +0100 @@ -2,7 +2,7 @@ # A set of functions to be used in PetitParser's Pharo CI jobs # -if [ ! -x "ci-common.sh" ]; then +if [ ! -f "ci-common.sh" ]; then wget -O "ci-common.sh" https://bitbucket.org/janvrany/stx-goodies-petitparser/raw/tip/ci/ci-common.sh fi . ci-common.sh diff -r f79944e2bd85 -r d83cb4945d5e ci/ci-pharo-test.sh --- a/ci/ci-pharo-test.sh Mon Nov 23 14:00:53 2015 +0100 +++ b/ci/ci-pharo-test.sh Tue Nov 24 19:37:14 2015 +0100 @@ -4,7 +4,7 @@ # set -e -if [ ! -x "ci-pharo-common.sh" ]; then +if [ ! -f "ci-pharo-common.sh" ]; then wget -O "ci-pharo-common.sh" https://bitbucket.org/janvrany/stx-goodies-petitparser/raw/tip/ci/ci-pharo-common.sh fi . ci-pharo-common.sh