Skip to content
Snippets Groups Projects
Commit 2719f298 authored by Jason Hiser's avatar Jason Hiser
Browse files

renamed workdir to avoid conflicts with other tests

parent bd6d2625
No related branches found
No related tags found
No related merge requests found
......@@ -15,14 +15,14 @@ main()
local orig_dir=$(pwd)
# puts peasoup_umbrella (and all submodules) in CICD_MODULE_WORK_DIR
cicd_setup_module_dependency allnp/peasoup_umbrella.git
cicd_setup_module_dependency allnp/peasoup_umbrella.git zipr_umbrella
# puts the version of zipr to test in peasoup_umbrella/zipr.
cicd_put_module_in_tree peasoup_umbrella/zipr
cicd_put_module_in_tree zipr_umbrella/zipr
# Build/run $PSZ, test result
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars
sudo ./get-peasoup-packages.sh all
./build-all.sh
......
......@@ -14,7 +14,7 @@ main()
if [[ $CICD_NIGHTLY == 1 ]] ; then
rm -rf $CICD_MODULE_WORK_DIR/peasoup_umbrella
rm -rf $CICD_MODULE_WORK_DIR/zipr_umbrella
fi
}
......
......@@ -3,7 +3,7 @@
set -e
set -x
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars
# run zipr internal tests
cd $ZIPR_HOME/test; scons
......
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
cd $CICD_MODULE_WORK_DIR/zipr_umbrella
set -e
set -x
......
......@@ -2,7 +2,7 @@
set -e
set -x
cd $CICD_MODULE_WORK_DIR/peasoup_umbrella
cd $CICD_MODULE_WORK_DIR/zipr_umbrella
source set_env_vars
cd /tmp
rm -rf ls.rida ped_ls; $PSZ /bin/ls ./ls.rida -c rida=on -s meds_static=off --tempdir ped_ls || true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment