Commit 0b993151 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

test: Fix a few instances of errant cd 



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

Change-Id: I5e20784694cb61fac2cf148628de566361e2673e
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/472650


Reviewed-by: default avataryidong0635 <dongx.yi@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 9c641107

autopackage.sh

+4 −12
Original line number Diff line number Diff line
@@ -55,30 +55,22 @@ 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 ..

	cd dpdk && git archive HEAD^{tree} --prefix=dpdk/ -o ../${dpdk_tarball}

	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 ..

	cd intel-ipsec-mb && git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}

	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 ..

	cd isa-l && git archive HEAD^{tree} --prefix=isa-l/ -o ../${isal_tarball}

	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 ..

	cd ocf && git archive HEAD^{tree} --prefix=ocf/ -o ../${ocf_tarball}

	tar -C "$tmpdir/${spdk_pv}" -xf $ocf_tarball

fi

test/unit/unittest.sh

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

	cd $rootdir && git clean -f "*.gcda"

fi



set +x