diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-09 08:57:51 -0800 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2016-02-09 08:57:51 -0800 |
| commit | 2a9d5e1c01c556e9cec9b97ab358f2df49075d9b (patch) | |
| tree | 9c89db9cd51ffc02dccd11eb928652e38a79cabd /test/distrib | |
| parent | 9b6d8450099f1aadd6ed8bdd6134180464ea5fe0 (diff) | |
| parent | 0474a1c393811034b281b8fc014604055c30a862 (diff) | |
Merge pull request #5151 from jtattermusch/fix_artifacts_and_distribtests
Some distribtest fixes
Diffstat (limited to 'test/distrib')
| -rwxr-xr-x | test/distrib/csharp/run_distrib_test.sh | 5 | ||||
| -rwxr-xr-x | test/distrib/python/run_distrib_test.sh | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/distrib/csharp/run_distrib_test.sh b/test/distrib/csharp/run_distrib_test.sh index 8ddb4c4bff..1de62041b3 100755 --- a/test/distrib/csharp/run_distrib_test.sh +++ b/test/distrib/csharp/run_distrib_test.sh @@ -34,8 +34,9 @@ cd $(dirname $0) unzip -o "$EXTERNAL_GIT_ROOT/input_artifacts/csharp_nugets.zip" -d TestNugetFeed -# TODO(jtattermusch): replace the version number -./update_version.sh 0.13.0 +# Extract the version number from Grpc nuget package name. +CSHARP_VERSION=$(ls TestNugetFeed | grep '^Grpc\.[0-9].*\.nupkg$' | sed s/^Grpc\.// | sed s/\.nupkg$//) +./update_version.sh $CSHARP_VERSION nuget restore diff --git a/test/distrib/python/run_distrib_test.sh b/test/distrib/python/run_distrib_test.sh index 08856ad388..8fd7ffb54c 100755 --- a/test/distrib/python/run_distrib_test.sh +++ b/test/distrib/python/run_distrib_test.sh @@ -32,11 +32,11 @@ set -ex cd $(dirname $0) -# TODO(jtattermusch): replace the version number -SDIST_ARCHIVE="$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-0.12.0b8.tar.gz" +# Pick up the source dist archive whatever its version is +SDIST_ARCHIVE=$EXTERNAL_GIT_ROOT/input_artifacts/grpcio-*.tar.gz BDIST_DIR="file://$EXTERNAL_GIT_ROOT/input_artifacts" -if [ ! -f "${SDIST_ARCHIVE}" ] +if [ ! -f ${SDIST_ARCHIVE} ] then echo "Archive ${SDIST_ARCHIVE} does not exist." exit 1 @@ -52,7 +52,7 @@ $PIP install --upgrade six GRPC_PYTHON_BINARIES_REPOSITORY="${BDIST_DIR}" \ $PIP install \ - "${SDIST_ARCHIVE}" + ${SDIST_ARCHIVE} $PYTHON distribtest.py |