[kvm-unit-tests,3/6] arch-run: DRYRUN is no longer needed, kill it

Commit Message

Andrew Jones Jan. 22, 2016, 2:58 p.m. UTC

Signed-off-by: Andrew Jones <[e-mail]>
---
 arm/run | 31 +++++++++----------------------
 x86/run | 10 ++++------
 2 files changed, 13 insertions(+), 28 deletions(-)

Patch

diff --git a/arm/run b/arm/run
index 0158ca5649a9f..654a17c8f69c2 100755
--- a/arm/run
+++ b/arm/run
@@ -17,32 +17,21 @@  if [ -c /dev/kvm ]; then
 	fi
 fi
 
-if [ "$ACCEL" = "kvm" ] && [ "$kvm_available" != "yes" ] &&
-		[ "$DRYRUN" != "yes" ]; then
-	printf "skip $TESTNAME (kvm only)\n\n"
+if [ "$ACCEL" = "kvm" ] && [ "$kvm_available" != "yes" ]; then
+	echo "skip $TESTNAME (kvm only)"
 	exit 2
 fi
 
 if [ -z "$ACCEL" ]; then
-	if [ "$DRYRUN" = "yes" ]; then
-		# Output kvm with tcg fallback for dryrun (when both are
-		# allowed), since the command line we output may get used
-		# elsewhere.
-		ACCEL="kvm:tcg"
-	elif [ "$kvm_available" = "yes" ]; then
+	if [ "$kvm_available" = "yes" ]; then
 		ACCEL="kvm"
 	else
 		ACCEL="tcg"
 	fi
 fi
 
-if [ "$ARCH" = "arm64" ]; then
-	if [[ $ACCEL =~ kvm ]]; then
-		# arm64 must use '-cpu host' with kvm, and we can't use
-		# '-cpu host' with tcg, so we force kvm-only (no fallback)
-		ACCEL="kvm"
-		processor="host"
-	fi
+if [ "$ARCH" = "arm64" ] && [ "$ACCEL" = "kvm" ]; then
+	processor="host"
 fi
 
 qemu="${QEMU:-qemu-system-$ARCH_NAME}"
@@ -79,9 +68,7 @@  command="$qemu $M -cpu $processor $chr_testdev"
 command+=" -display none -serial stdio -kernel"
 echo $command "$@"
 
-if [ "$DRYRUN" != "yes" ]; then
-	$command "$@"
-	ret=$?
-	echo Return value from qemu: $ret
-	exit $ret
-fi
+$command "$@"
+ret=$?
+echo Return value from qemu: $ret
+exit $ret
diff --git a/x86/run b/x86/run
index 39a7cb92115cb..bdd7c7e394e45 100755
--- a/x86/run
+++ b/x86/run
@@ -45,9 +45,7 @@  fi
 command="${qemu} -enable-kvm $pc_testdev -vnc none -serial stdio $pci_testdev $hyperv_testdev -kernel"
 echo ${command} "$@"
 
-if [ "$DRYRUN" != "yes" ]; then
-	${command} "$@"
-	ret=$?
-	echo Return value from qemu: $ret
-	exit $ret
-fi
+${command} "$@"
+ret=$?
+echo Return value from qemu: $ret
+exit $ret