diff options
Diffstat (limited to 'src/test/testcases/testSecurity.py')
| -rw-r--r-- | src/test/testcases/testSecurity.py | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/src/test/testcases/testSecurity.py b/src/test/testcases/testSecurity.py index 770ef012..d4e3efaf 100644 --- a/src/test/testcases/testSecurity.py +++ b/src/test/testcases/testSecurity.py @@ -5,7 +5,7 @@ # # OpenPOWER sbe Project # -# Contributors Listed Below - COPYRIGHT 2017,2018 +# Contributors Listed Below - COPYRIGHT 2017,2019 # [+] International Business Machines Corp. # # @@ -25,10 +25,20 @@ import os import sys import struct +sys.path.append("targets/p9_nimbus/sbeTest" ) +sys.path.append("targets/p9_axone/sbeTest" ) +import testUtil import testScomUtil -SECURITY_FILE = "../../src/import/chips/p9/security/p9_security_white_black_list.csv" -SECURITY_SCRIPT = "../../src/build/security/securityRegListGen.py" +#SECURITY_FILE = "../../src/import/chips/p9/security/p9_security_white_black_list.csv" +#SECURITY_SCRIPT = "../../src/build/security/securityRegListGen.py" + +if testUtil.getMachineName() == "axone": + SECURITY_FILE = "targets/p9_axone/sbeTest/p9_security_white_black_list.csv" + SECURITY_SCRIPT = "targets/p9_axone/sbeTest/securityRegListGen.py" +else: + SECURITY_FILE = "../../src/import/chips/p9/security/p9_security_white_black_list.csv" + SECURITY_SCRIPT = "../../src/build/security/securityRegListGen.py" def getlist(cmd): os.system("python "+SECURITY_SCRIPT+" "+cmd+" -f "+SECURITY_FILE+" > temp") @@ -253,9 +263,19 @@ def binary_search(item, list, first, last, isMap = False): # Calling all test code #------------------------------------------------- if __name__=="__main__": - main() + if testUtil.getMachineName() == "axone": + try: + main() + except: + print ( "\nTest Suite completed with error(s)" ) + testUtil.collectFFDC() + raise() - if err: - print ("\nTest Suite completed with error(s)") + print ( "\nTest Suite completed with no errors" ) else: - print ("\nTest Suite completed with no errors") + main() + + if err: + print ("\nTest Suite completed with error(s)") + else: + print ("\nTest Suite completed with no errors") |
