d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "test: Fix a few instances of errant cd"

Browse Source 
This reverts commit 0b9931516d.

"cd $dir && ..." in single line does switch directory for
the following commands.

The patch being reverted, broke the nightly (autopackage.sh) tests.
It was only fixing couple of instances of SC2164,
which is being excluded either way.
https://github.com/koalaman/shellcheck/wiki/SC2164

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Id4f134ad98953b92fdc69cd0d0b80c02660cf7a9
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473220
Reviewed-by: Seth Howell <seth.howell@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Tomasz Zawadzki 2019-11-04 10:48:58 -05:00
parent c650e14434
commit 3ea70d336a
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
autopackage.sh
View File

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

4
test/unit/unittest.sh
View File

@ -188,7 +188,9 @@ if [ "$cov_avail" = "yes" ]; then
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
# git -C option not used for compatibility reasons
cd $rootdir && git clean -f "*.gcda"
cd $rootdir
git clean -f "*.gcda"
cd -
fi
set +x