finalize

scripts/ci/plat/generic/test.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -x
 
 # Source global test configuration fileA
 . scripts/ci/test-setup.sh
@@ -23,6 +22,7 @@ fi
 ###############
 ## Run tests ##
 ###############
+set -x
 
 # Fix permissions on the key
 chmod 600 "build-generic$KEYSTONE_BITS/buildroot.build/target/root/.ssh/id-rsa"

scripts/ci/plat/mpfs/flash-firmware.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -e
-set -x
 
 # Source global test configuration file
 . scripts/ci/test-setup.sh
 
 ###########
 ## Flash ##
 ###########
+set -x
 
 power_on
 make -C build-mpfs64/buildroot.build/build/hss-v2023.06 program 2>/dev/null > "$LOGFILE"

scripts/ci/plat/mpfs/flash-os.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 set -e
-set -x
 
 # Source global test configuration file
 . scripts/ci/test-setup.sh
 
 ###########
 ## Flash ##
 ###########
+set -x
 
 # Wait for the board to come up a bit. We'll hammer it with serial
 # input to ensure that we halt the boot at HSS
@@ -17,7 +17,11 @@ configure_tty "$TTYDEV" 115200
 
 power_on
 NOW=$(date +%s)
+
+# Disable output when actually hammering cause this is spammy
+set +x
 while [[ $(( $(date +%s) - $NOW )) -lt 10 ]]; do echo 'a' > "$TTYDEV" ; done
+set -x
 
 # Board should have halted, kick it into flash update mode
 

scripts/ci/plat/mpfs/test.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -e
-set -x
 
 # Source global test configuration file
 . scripts/ci/test-setup.sh
@@ -13,6 +12,7 @@ fi
 ###############
 ## Run tests ##
 ###############
+set -x
 
 # Fix permissions on the key
 chmod 600 build-mpfs64/buildroot.build/target/root/.ssh/id-rsa

scripts/ci/test-setup.sh

@@ -118,4 +118,5 @@ function stop_record_tty {
 	fi
 
 	screen -XS "$1" quit
+	screen -wipe
 }