From 269cd4dbc18e95297f26202dff9dc42835981ab1 Mon Sep 17 00:00:00 2001
From: Enkhbold Ochirsuren <E.Ochirsuren@gsi.de>
Date: Wed, 19 Jul 2023 11:34:55 +0200
Subject: [PATCH] fbas: timing RTE: deploy the test artifacts

In this case, test artifact includes a plain text file with timing events,
which will be injected locally with 'saft-dm'.
(used in test_ttf_count_mps_events.sh)
---
 modules/fbas/Makefile                | 13 +++++++++----
 modules/fbas/rte/asl/loader.sh       |  5 +++--
 modules/fbas/rte/asl/timing-rte.sh   |  3 +++
 modules/fbas/rte/check-rte.sh        | 20 ++++++++++++++++++++
 modules/fbas/rte/check-yocto-rte.sh  |  8 ++++++++
 modules/fbas/rte/deploy-yocto-rte.sh |  6 ++++++
 6 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/modules/fbas/Makefile b/modules/fbas/Makefile
index e197c24de2..63c4693bd8 100644
--- a/modules/fbas/Makefile
+++ b/modules/fbas/Makefile
@@ -15,10 +15,10 @@ ARCH       = x86_64
 TARGET_RTE ?= fbas
 YOCTO_TARGET_RTE ?=$(TARGET_RTE)-yocto
 
-.SILENT .PHONY: check deploy check-yocto-rte deploy-yocto-rte firmware
+.SILENT .PHONY: check-sl7-rte deploy-sl7-rte check-yocto-rte deploy-yocto-rte firmware
 
-# deploy FBAS artifacts to the RTE directory
-deploy:
+# deploy FBAS artifacts to the RTE directory (for sl7 ramdisk)
+deploy-sl7-rte:
 	# TR LM32 firmware
 	echo deploy '$(FW)/*.bin' to '$(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/firmware'
 	mkdir -p $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/firmware
@@ -28,6 +28,11 @@ deploy:
 	echo deploy '$(TEST)/scu/*.sh to $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/$(ARCH)/bin'
 	cp -u -p $(TEST)/scu/*.sh $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/$(ARCH)/bin
 
+	# test artifacts (ie., schedule for local injection)
+	echo deploy '$(TEST)/scu/*.sched to $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/test'
+	mkdir -p $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/test
+	cp -u -p $(TEST)/scu/*.sched $(NFSBASE)/$(TIMING_RTE)/$(TARGET_RTE)/test
+
 	# RTE script for NFSinit symlink
 	echo deploy '$(ASL)/timing-rte-$(TARGET_RTE)' to '$(NFSBASE)/nfsinit/global'
 	cp -u -p $(ASL)/timing-rte-$(TARGET_RTE) $(NFSBASE)/nfsinit/global
@@ -41,7 +46,7 @@ deploy-yocto-rte:
 	TARGET_RTE=$(YOCTO_TARGET_RTE) NFSBASE_PATH=$(NFSBASE) ARCH=$(ARCH) ./rte/deploy-yocto-rte.sh
 
 # check if target RTE is built
-check:
+check-sl7-rte:
 	TARGET_RTE=$(TARGET_RTE) NFSBASE_PATH=$(NFSBASE) ARCH=$(ARCH) ./$(RTE)/check-rte.sh
 
 check-yocto-rte:
diff --git a/modules/fbas/rte/asl/loader.sh b/modules/fbas/rte/asl/loader.sh
index ebad5e67a0..11385e3d73 100755
--- a/modules/fbas/rte/asl/loader.sh
+++ b/modules/fbas/rte/asl/loader.sh
@@ -3,5 +3,6 @@
 
 ARCH=$(/bin/uname -m)
 
-cp $1/$ARCH/bin/* /usr/bin
-cp $1/firmware/* /home/root
+cp $1/$ARCH/bin/* /usr/bin  # test scripts
+cp $1/firmware/* /home/root # firmware binaries
+cp $1/test/*     /home/root # test artifacts
diff --git a/modules/fbas/rte/asl/timing-rte.sh b/modules/fbas/rte/asl/timing-rte.sh
index a67e814f76..54758fb390 100755
--- a/modules/fbas/rte/asl/timing-rte.sh
+++ b/modules/fbas/rte/asl/timing-rte.sh
@@ -86,6 +86,9 @@ fi
 log 'copying firmware to ramdisk'
 cp -a /opt/$NAME/firmware/* /
 
+log 'copying test artifacts to ramdisk'
+cp -a /opt/$NAME/test/* /
+
 log 'starting services'
 # start saftlib for multiple devices: saftd tr0:dev/wbm0 tr1:dev/wbm1 tr2:dev/wbm2 ... trXYZ:dev/wbmXYZ
 saftlib_devices=$(for dev in /dev/wbm*; do echo tr${dev#/dev/wbm}:${dev#/}; done)
diff --git a/modules/fbas/rte/check-rte.sh b/modules/fbas/rte/check-rte.sh
index 1299e4d77c..807ad61fff 100755
--- a/modules/fbas/rte/check-rte.sh
+++ b/modules/fbas/rte/check-rte.sh
@@ -93,7 +93,27 @@ setup_rte_build() {
 	sed -i "s|^DEPLOY_TARGET=.*|DEPLOY_TARGET=\"$TARGET_RTE_PATH\"|" $TIMING_RTE_BUILDER
 }
 
+check_fbas_stuff() {
+
+	# check the presence of the FBAS stuff
+	ls $TARGET_RTE_PATH/firmware/*.bin
+	if [ $? -eq 0 ]; then
+		echo "PASS: FBAS LM32 firmware is available: $TARGET_RTE_PATH/firmware/*.bin"
+	else
+		echo "FAIL: FBAS LM32 firmware is not found: $TARGET_RTE_PATH/firmware/*.bin"
+	fi
+
+	ls $TARGET_RTE_PATH/test/*.sched
+	if [ $? -eq 0 ]; then
+		echo "PASS: FBAS test schedules are available: $TARGET_RTE_PATH/test/*.sched"
+	else
+		echo "FAIL: FBAS test schedules are not found: $TARGET_RTE_PATH/test/*.sched"
+	fi
+
+}
+
 check_rte_location
 check_rte_builder
 check_rte_builder_settings
 check_nfsinit_scripts
+check_fbas_stuff
diff --git a/modules/fbas/rte/check-yocto-rte.sh b/modules/fbas/rte/check-yocto-rte.sh
index d452e4e0d0..056e13a1b4 100755
--- a/modules/fbas/rte/check-yocto-rte.sh
+++ b/modules/fbas/rte/check-yocto-rte.sh
@@ -46,6 +46,14 @@ check_fbas_stuff() {
 	else
 		echo "FAIL: FBAS test scripts are not found: $TARGET_RTE_PATH/$ARCH/bin/*.sh"
 	fi
+
+	ls $TARGET_RTE_PATH/test/*.sched
+	if [ $? -eq 0 ]; then
+		echo "PASS: FBAS test schedules are available: $TARGET_RTE_PATH/test/*.sched"
+	else
+		echo "FAIL: FBAS test schedules are not found: $TARGET_RTE_PATH/test/*.sched"
+	fi
+
 }
 
 check_rte_location
diff --git a/modules/fbas/rte/deploy-yocto-rte.sh b/modules/fbas/rte/deploy-yocto-rte.sh
index 926d20831c..4ba0804205 100755
--- a/modules/fbas/rte/deploy-yocto-rte.sh
+++ b/modules/fbas/rte/deploy-yocto-rte.sh
@@ -34,6 +34,12 @@ deploy_fbas_artifacts() {
 	echo "deploy $TEST_PATH/scu/*.sh to $TARGET_RTE_PATH/$ARCH/bin"
 	mkdir -p $TARGET_RTE_PATH/$ARCH/bin
 	cp -u -p $TEST_PATH/scu/*.sh $TARGET_RTE_PATH/$ARCH/bin
+
+	# test artifacts
+	echo "deploy $TEST_PATH/scu/*.sched to $TARGET_RTE_PATH/test"
+	mkdir -p $TARGET_RTE_PATH/test
+	cp -u -p $TEST_PATH/scu/*.sched $TARGET_RTE_PATH/test
+
 }
 
 deploy_rte_scripts() {