Skip to content

Commit 3b8fe44

Browse files
chetan-rathoreamrathesh
chetan-rathore
and
amrathesh
authored
BBR Release changes (#87)
* Deprecate 32-bit support * Pivot and Hive related changes * Moving bbr tests from EFI/BOOT to acs_tests * added standalone sct version patches - added patches for sbbr and ebbr - script changes to apply the patches. Signed-off-by: Amrathesh <amrathesh@arm.com> Change-Id: Iae7d5895ab337ccb784514b9158dd6a00d663ba9 --------- Signed-off-by: Amrathesh <amrathesh@arm.com> Co-authored-by: Amrathesh <amrathesh@arm.com>
1 parent 22f9b84 commit 3b8fe44

28 files changed

Lines changed: 378 additions & 3287 deletions

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ To run SCT manually, follow these steps:
3333

3434

3535
1. `Shell>FS(X):`
36-
- `FS(X):>cd EFI\BOOT\bbr\SCT`
36+
- `FS(X):>cd acs_tests\bbr\SCT`
3737
- To run EBBR or SBBR tests
38-
`FS(X):EFI\BOOT\bbr\SCT>SCT -s <ebbr.seq/sbbr.seq>`
38+
`FS(X):acs_tests\bbr\SCT>SCT -s <ebbr.seq/sbbr.seq>`
3939
- To run all tests
40-
`FS(X):EFI\BOOT\bbr\SCT>SCT -a -v`
40+
`FS(X):acs_tests\bbr\SCT>SCT -a -v`
4141

4242

4343
You can also select and run tests individually. For more information on running the tests, see the [SCT User Guide](http://www.uefi.org/testtools).
@@ -60,7 +60,7 @@ To run the tests, follow these steps.
6060

6161
2. Run manual tests.
6262

63-
- `FS(X):EFI\BOOT\bbr\SCT>SCT -s <ebbr_manual.seq/sbbr_manual.seq>`
63+
- `FS(X):acs_tests\bbr\SCT>SCT -s <ebbr_manual.seq/sbbr_manual.seq>`
6464

6565
3. While the system runs the reset tests, you may have to manually reset the system if it hangs.
6666

‎bbsr/config/BBSRStartup.nsh‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
#!/usr/bin/env bash
2+
3+
# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
4+
# SPDX-License-Identifier : Apache-2.0
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
##
18+
19+
echo -off
20+
21+
for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F
22+
if exist FS%i:\acs_tests\bbr\SCT then
23+
#
24+
# Found EFI SCT harness
25+
#
26+
FS%i:
27+
cd FS%i:\acs_tests\bbr\SCT
28+
echo "Press any key to stop the BBSR SCT running"
29+
stallforkey.efi 5
30+
if %lasterror% == 0 then
31+
goto Done
32+
endif
33+
for %j in 0 1 2 3 4 5 6 7 8 9 A B C D E F then
34+
if exists FS%j:\acs_results\ then
35+
if exists FS%j:\acs_results\BBSR\sct_results then
36+
37+
#Check if SCT run has already completed
38+
if exist FS%j:\acs_results\BBSR\sct_results\Overall\Summary.log then
39+
echo "BBSR SCT has completed run."
40+
echo "Press any key to start BBSR SCT execution from the beginning."
41+
echo "WARNING: Ensure you have backed up the existing logs."
42+
stallforkey.efi 5
43+
if %lasterror% == 0 then
44+
#Backup the existing logs
45+
rm -q FS%j:\acs_results\BBSR\sct_results_previous_run
46+
mkdir FS%j:\acs_results\BBSR\sct_results_previous_run
47+
cp -r FS%j:\acs_results\BBSR\sct_results FS%j:\acs_results\sct_results_previous_run
48+
rm -q FS%j:\acs_results\BBSR\sct_results
49+
goto StartSCT
50+
else
51+
goto Done
52+
endif
53+
endif
54+
55+
if exist FS%i:\acs_tests\bbr\SCT\.passive.mode then
56+
if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then
57+
Sct -c -p mnp -v
58+
else
59+
Sct -c -p mnp
60+
endif
61+
else
62+
if exist FS%i:\acs_tests\bbr\SCT\.verbose.mode then
63+
Sct -c -v
64+
else
65+
Sct -c
66+
endif
67+
68+
#SCT execution has finished. Copy the logs to acs_results
69+
if exist FS%j:\acs_results\sct_results\ then
70+
if exist FS%i:\acs_tests\bbr\SCT\Overall then
71+
cp -r FS%i:\acs_tests\bbr\SCT\Overall FS%j:\acs_results\BBSR\sct_results\
72+
endif
73+
if exist FS%i:\acs_tests\bbr\SCT\Sequence then
74+
cp -r FS%i:\acs_tests\bbr\SCT\Sequence\BBSR.seq FS%j:\acs_results\BBSR\sct_results\
75+
endif
76+
#Restart to avoid an impact of running SCT tests on rest of the suites
77+
echo "Reset the system ..."
78+
reset
79+
endif
80+
endif
81+
else
82+
:StartSCT
83+
FS%j:
84+
cd FS%j:\acs_results
85+
mkdir BBSR
86+
cd FS%j:\acs_results\BBSR
87+
mkdir sct_results
88+
FS%i:
89+
cd FS%i:\acs_tests\bbr\SCT
90+
Sct -s BBSR.seq
91+
goto Done
92+
endif
93+
endif
94+
endfor
95+
endif
96+
endfor
97+
98+
:Done

‎bbsr/config/sie_SctStartup.nsh‎

Lines changed: 0 additions & 106 deletions
This file was deleted.

bbsr/patches/0001-SIE-Patch-for-UEFI-SCT-Build.patch renamed to bbsr/patches/0001-BBSR-Patch-for-UEFI-SCT-Build.patch

File renamed without changes.

‎common/config/ScrtStartup.nsh‎

Lines changed: 26 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,31 @@
1-
# Copyright (c) 2023, ARM Limited and Contributors. All rights reserved.
2-
#
3-
# Redistribution and use in source and binary forms, with or without
4-
# modification, are permitted provided that the following conditions are met:
5-
#
6-
# Redistributions of source code must retain the above copyright notice, this
7-
# list of conditions and the following disclaimer.
1+
#!/usr/bin/env bash
2+
3+
# Copyright (c) 2021-2024, Arm Limited or its affiliates. All rights reserved.
4+
# SPDX-License-Identifier : Apache-2.0
85
#
9-
# Redistributions in binary form must reproduce the above copyright notice,
10-
# this list of conditions and the following disclaimer in the documentation
11-
# and/or other materials provided with the distribution.
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
129
#
13-
# Neither the name of ARM nor the names of its contributors may be used
14-
# to endorse or promote products derived from this software without specific
15-
# prior written permission.
10+
# http://www.apache.org/licenses/LICENSE-2.0
1611
#
17-
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18-
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19-
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20-
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
21-
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22-
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23-
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24-
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25-
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26-
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27-
# POSSIBILITY OF SUCH DAMAGE.
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
##
18+
2819

2920
echo -off
3021

3122
for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F
32-
if exist FS%i:\EFI\BOOT\bbr\SCT\SCRT then
23+
if exist FS%i:\acs_tests\bbr\SCT\SCRT then
3324
#
3425
# Found EFI SCRT harness
3526
#
3627
FS%i:
37-
cd FS%i:\EFI\BOOT\bbr\SCT\SCRT
28+
cd FS%i:\acs_tests\bbr\SCT\SCRT
3829

3930
#Check if SCRT run is already in progress
4031
if exist SCRT_run_progress.flag then
@@ -47,27 +38,29 @@ for %i in 0 1 2 3 4 5 6 7 8 9 A B C D E F
4738
#Save the logs in acs_results
4839
for %j in 0 1 2 3 4 5 6 7 8 9 A B C D E F then
4940
if exists FS%j:\acs_results\ then
50-
mkdir FS%j:\acs_results\sct_results
51-
mkdir FS%j:\acs_results\sct_results\SCRT
52-
cp SCRT.log FS%j:\acs_results\sct_results\SCRT\SCRT.log
53-
cp SCRT.conf FS%j:\acs_results\sct_results\SCRT\SCRT.conf
41+
mkdir FS%j:\acs_results\scrt_results
42+
mkdir FS%j:\acs_results\scrt_results
43+
cp SCRT.log FS%j:\acs_results\scrt_results\SCRT.log
44+
cp SCRT.conf FS%j:\acs_results\scrt_results\SCRT.conf
5445
endif
5546
endfor
5647

5748
goto Done
5849
endif
5950

6051
echo SCRT run. Press any key to stop the EFI SCRT running
61-
FS%i:\EFI\BOOT\bbr\SCT\stallforkey.efi 5
52+
FS%i:\acs_tests\bbr\SCT\stallforkey.efi 5
6253
if %lasterror% == 0 then
6354
goto Done
6455
endif
6556

6657
echo "Note: The System will automatically reset as part of SCRT testing"
6758

6859
if exist SCRT.log then
69-
echo SCRT is already run. Press any key to run SCRT again. WARNING: Ensure you have backed up the existing logs.
70-
FS%i:\EFI\BOOT\bbr\SCT\stallforkey.efi 5
60+
echo "SCRT is already run."
61+
echo "Press any key to run SCRT again."
62+
echo "WARNING: Ensure you have backed up the existing logs."
63+
FS%i:\acs_tests\bbr\SCT\stallforkey.efi 5
7164
if %lasterror% == 0 then
7265
#Backup the existing logs
7366
cp SCRT.log SCRT.log_previous_run

common/config/bbr_common_config.cfg renamed to common/config/bbr_source.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ SCT_SRC_TAG=abb54c667fe6ae2a41144c010871569ef519c459
4141
FWTS_SRC_TAG=V23.01.00
4242

4343
# EDK2 source tag from https://github.com/tianocore/edk2.git
44-
EDK2_SRC_VERSION=edk2-stable202208
44+
EDK2_SRC_VERSION=edk2-stable202208

0 commit comments

Comments
 (0)