prod: adrv9361: check tty port before testing UART

Signed-off-by: Ramona Alexandra Nechita <[email protected]>
analogdevicesinc · Jun 2, 2022 · 6a4c33a · 6a4c33a
1 parent 72f8a6c
commit 6a4c33a
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/main_tests/lib/production.sh b/main_tests/lib/production.sh
@@ -317,22 +317,13 @@ production() {
         fi
 
 	if [ "$FAILED" == "0" ] ; then
-<<<<<<< HEAD
 		console_ascii_passed
 		if [ $SYNCHRONIZATION -eq 0 ]; then
 			cat "$LOGFILE" > "$LOGDIR/passed_${BOARD_SERIAL}_${RUN_TIMESTAMP}.log"
 		else
 			cat "$LOGFILE" > "$LOGDIR/no_date_passed_${BOARD_SERIAL}_${RUN_TIMESTAMP}.log"
 		fi
 		cat /dev/null > "$LOGFILE"
-=======
-			if [ $SYNCHRONIZATION -eq 0 ]; then
-				cat "$LOGFILE" > "$LOGDIR/passed_${BOARD_SERIAL}_${RUN_TIMESTAMP}.log"
-			else
-				cat "$LOGFILE" > "$LOGDIR/no_date_passed_${BOARD_SERIAL}_${RUN_TIMESTAMP}.log"
-			fi
-			cat /dev/null > "$LOGFILE"
->>>>>>> 74fb9fc... prod: tests common: add support for remote logging
 	fi
 	telemetry prod-logs-upload --tdir $LOGDIR
 }