From e0822011d10713b931be639d37f99f2f557e38ea Mon Sep 17 00:00:00 2001
From: Quentin Perret <quentin.perret@arm.com>
Date: Wed, 29 Nov 2017 14:05:20 +0000
Subject: [PATCH] test_series: fix WA invocation with multiple devices

The ADB device name passed to test_series is currently used to flash and
reboot the board using ADB and Fastboot. However, it is not yet passed
to WA3 which then complains whenever several ADB devices are connected.
This commit fixes this behaviour by making the config fragment currently
used for the ACME more general and appending a "device_config" section
to it.
---
 tools/wltests/test_series | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/wltests/test_series b/tools/wltests/test_series
index 97e91cbca..8726c6ca7 100755
--- a/tools/wltests/test_series
+++ b/tools/wltests/test_series
@@ -364,14 +364,18 @@ if [ ! -z $WA_AGENDA ]; then
 		list_available_agendas
 		exit $INVAL
 	fi
-	# Generate a WA configuration fragment for the ACME cape
+	# Generate a WA configuration fragment for the ACME cape and ADB
 	IIO_DEVICES=""
 	for CH in $ACME_CHANNELS; do
 		IIO_DEVICES="$IIO_DEVICES \"iio:device$CH\", "
 	done
-	ACME_CONF=$RESULTS/config_acme.yaml
+	WA_LOCAL_CONF=$RESULTS/config_local.yaml
 	mkdir -p $RESULTS &>/dev/null
-	cat >$ACME_CONF <<EOF
+	cat >$WA_LOCAL_CONF <<EOF
+# Automatically generated ADB device configuration based on test_series options
+device_config:
+  device: $DEVICE
+
 # Automatically generated ACME configuration based on test_series options
 energy_measurement:
   instrument: acme_cape
@@ -382,7 +386,7 @@ energy_measurement:
     iio_devices: [$IIO_DEVICES]
 EOF
 	TEST_CMD_RESULTS="$RESULTS/wa.\${COMMIT_SHA1:0:7}_\${COMMIT_NAME}"
-	TEST_CMD="wa run -f -d \"$TEST_CMD_RESULTS\" -c \"$ACME_CONF\" \"$WA_AGENDA\""
+	TEST_CMD="wa run -f -d \"$TEST_CMD_RESULTS\" -c \"$WA_LOCAL_CONF\" \"$WA_AGENDA\""
 fi
 
 # Prepare ADB and FASTBOOT commands to target the specified device
-- 
GitLab