ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: Fix a few instances of errant cd

Browse Source 
Don't change the directory of the script if at all possible.

Change-Id: I5e20784694cb61fac2cf148628de566361e2673e
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472650
Reviewed-by: yidong0635 <dongx.yi@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Ben Walker 2019-10-28 14:07:41 -07:00 committed by Jim Harris
parent 9c64110700
commit 0b9931516d
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autopackage.sh
View File

@ -55,30 +55,22 @@ echo "tmpdir=$tmpdir"
tar -C "$tmpdir" -xf $spdk_tarball tar -C "$tmpdir" -xf $spdk_tarball
if [ -z "$WITH_DPDK_DIR" ]; then if [ -z "$WITH_DPDK_DIR" ]; then
cd dpdk cd dpdk && git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}
git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}
cd ..
tar -C "$tmpdir/${spdk_pv}" -xf $dpdk_tarball tar -C "$tmpdir/${spdk_pv}" -xf $dpdk_tarball
fi fi
if [ -d "intel-ipsec-mb" ]; then if [ -d "intel-ipsec-mb" ]; then
cd intel-ipsec-mb cd intel-ipsec-mb && git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}
git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}
cd ..
tar -C "$tmpdir/${spdk_pv}" -xf $ipsec_tarball tar -C "$tmpdir/${spdk_pv}" -xf $ipsec_tarball
fi fi
if [ -d "isa-l" ]; then if [ -d "isa-l" ]; then
cd isa-l cd isa-l && git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}
git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}
cd ..
tar -C "$tmpdir/${spdk_pv}" -xf $isal_tarball tar -C "$tmpdir/${spdk_pv}" -xf $isal_tarball
fi fi
if [ -d "ocf" ]; then if [ -d "ocf" ]; then
cd ocf cd ocf && git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}
cd ..
tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball
fi fi

4
test/unit/unittest.sh
View File

@ -188,9 +188,7 @@ if [ "$cov_avail" = "yes" ]; then
rm -f $UT_COVERAGE/ut_cov_base.info $UT_COVERAGE/ut_cov_test.info rm -f $UT_COVERAGE/ut_cov_base.info $UT_COVERAGE/ut_cov_test.info
genhtml $UT_COVERAGE/ut_cov_unit.info --output-directory $UT_COVERAGE genhtml $UT_COVERAGE/ut_cov_unit.info --output-directory $UT_COVERAGE
# git -C option not used for compatibility reasons # git -C option not used for compatibility reasons
cd $rootdir cd $rootdir && git clean -f "*.gcda"
git clean -f "*.gcda"
cd -
fi fi
set +x set +x