Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/config/acs_run_config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sbsa_level = 4
# Add selected rules to run here.
sbsa_select_rules =
# Add rules which you want to skip here.
sbsa_skip_rules =
sbsa_skip_rules = S_L3_01
# valid values 1,2,3,4,5
sbsa_verbose = 3

Expand Down
5 changes: 2 additions & 3 deletions common/linux_scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
fi
fi


# Linux SBSA Execution
echo "Running Linux SBSA tests"
if [ "$automation_enabled" == "True" ]; then
Expand All @@ -257,8 +256,8 @@ if [ $ADDITIONAL_CMD_OPTION != "noacs" ]; then
if [ -f /lib/modules/sbsa_acs.ko ]; then
insmod /lib/modules/sbsa_acs.ko
echo "${SR_VERSION}" > /mnt/acs_results/linux/SbsaResultsApp.log
echo "Running command $sbsa_command --skip S_L3_01,PCI_MM_03 --skip-dp-nic-ms"
$sbsa_command --skip S_L3_01,PCI_MM_03 --skip-dp-nic-ms >> /mnt/acs_results/linux/SbsaResultsApp.log
echo "Running command $sbsa_command --skip PCI_MM_03 --skip-dp-nic-ms"
$sbsa_command --skip PCI_MM_03 --skip-dp-nic-ms >> /mnt/acs_results/linux/SbsaResultsApp.log
dmesg | sed -n 'H; /PE_INFO/h; ${g;p;}' > /mnt/acs_results/linux/SbsaResultsKernel.log
sync /mnt
sleep 5
Expand Down
20 changes: 10 additions & 10 deletions common/uefi_scripts/sbsa.nsh
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F then
if "%1" == "" then
FS%i:
acs_tests\parser\Parser.efi -sbsa
echo "UEFI EE SBSA Command: %SbsaCommand% -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\%SbsaCommand% -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log
echo "UEFI EE SBSA Command: %SbsaCommand% -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\%SbsaCommand% -skip-dp-nic-ms -f SbsaTempResults.log
goto SbsaEE
endif
if exist FS%i:\acs_tests\bsa\sbsa\Sbsa.efi then
Expand All @@ -70,8 +70,8 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F then
goto SbsaNormalMode
endif
:SbsaVerboseRun
echo "SBSA Command: Sbsa.efi -v 1 -skip S_L3_01 -skip-dp-nic-ms -f SbsaVerboseTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -v 1 -skip S_L3_01 -skip-dp-nic-ms -f SbsaVerboseTempResults.log
echo "SBSA Command: Sbsa.efi -v 1 -skip-dp-nic-ms -f SbsaVerboseTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -v 1 -skip-dp-nic-ms -f SbsaVerboseTempResults.log
stall 200000
if exist FS%i:\acs_results\uefi\SbsaVerboseTempResults.log then
cp SbsaVerboseTempResults.log SbsaVerboseResults.log
Expand Down Expand Up @@ -100,16 +100,16 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F then
endif
:SbsaNormalRun
if "%1" == "false" then
echo "SBSA Command: Sbsa.efi -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log
echo "SBSA Command: Sbsa.efi -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -skip-dp-nic-ms -f SbsaTempResults.log
else
if "%SbsaCommand%" == "" then
echo "SbsaCommand variable does not exist, running default command Sbsa.efi"
echo "SBSA Command: Sbsa.efi -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log
echo "SBSA Command: Sbsa.efi -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\Sbsa.efi -skip-dp-nic-ms -f SbsaTempResults.log
else
echo "SBSA Command: %SbsaCommand% -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\%SbsaCommand% -skip S_L3_01 -skip-dp-nic-ms -f SbsaTempResults.log
echo "SBSA Command: %SbsaCommand% -skip-dp-nic-ms -f SbsaTempResults.log"
FS%i:\acs_tests\bsa\sbsa\%SbsaCommand% -skip-dp-nic-ms -f SbsaTempResults.log
endif
endif
stall 200000
Expand Down
Loading