Commit 3ea70d33 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

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

This reverts commit 0b993151.

"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: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Id4f134ad98953b92fdc69cd0d0b80c02660cf7a9
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/473220


Reviewed-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent c650e144

autopackage.sh

+12 −4
Original line number Diff line number Diff line
@@ -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

test/unit/unittest.sh

+3 −1
Original line number Diff line number Diff line
@@ -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