Correct issue with new option s for runall test script

Testing/cmsis_build/runall.py

@@ -81,14 +81,14 @@ def msg(self):
 # in case of error since the test report is giving
 # all the details. So, there is an option to
 # disable the dump of stderr
-def run(*args,mustPrint=False,dumpStdErr=True):
+def run(*args,mustPrint=False,dumpStdErr=True,withExitCodeCheck=True):
  global ERROR_OCCURED
  global DEBUG
  try:
  if DEBUG:
  print(" ".join(args))
  result=subprocess.run(args,text=True,capture_output=True,timeout=600)
- if args.s and (result.returncode !=0) :
+ if withExitCodeCheck and (result.returncode !=0) :
  ERROR_OCCURED = True
  if dumpStdErr:
  return(Result(result.stderr + f"\n\nSTDOUT (error code = {result.returncode}):\n\n" + result.stdout,error=True))
@@ -178,7 +178,7 @@ def runAVH(build,core,compiler):
 
 
 
- res=run(avh,"-f",config,app)
+ res=run(avh,"-f",config,app,withExitCodeCheck=args.s)
  return(res)
 
 ####################
@@ -248,15 +248,15 @@ def runAVH(build,core,compiler):
 compil_config={
  'AC6':[
  ("VHT-Corstone-300","CS300"),
- #("VHT_M33","M33_DSP_FP"),
+ ("VHT_M33","M33_DSP_FP"),
  ],
  'GCC':[
- #("VHT_M33","M33_DSP_FP"),
  ("VHT-Corstone-300","CS300"),
+ ("VHT_M33","M33_DSP_FP"),
  ],
  'CLANG':[
  ("VHT-Corstone-300","CS300"),
- #("VHT_M33","M33_DSP_FP"),
+ ("VHT_M33","M33_DSP_FP"),
  ]
 }
 

Testing/main.cpp

@@ -4,71 +4,12 @@ extern int testmain(const char *);
 
 extern "C" const char *patternData;
 
-//! \note for IAR
-#ifdef __IS_COMPILER_IAR__
-# undef __IS_COMPILER_IAR__
-#endif
-#if defined(__IAR_SYSTEMS_ICC__)
-# define __IS_COMPILER_IAR__ 1
-#endif
-
-
-
-
-//! \note for arm compiler 5
-#ifdef __IS_COMPILER_ARM_COMPILER_5__
-# undef __IS_COMPILER_ARM_COMPILER_5__
-#endif
-#if ((__ARMCC_VERSION >= 5000000) && (__ARMCC_VERSION < 6000000))
-# define __IS_COMPILER_ARM_COMPILER_5__ 1
-#endif
-//! @}
-
-//! \note for arm compiler 6
-#ifdef __IS_COMPILER_ARM_COMPILER_6__
-# undef __IS_COMPILER_ARM_COMPILER_6__
-#endif
-#if ((__ARMCC_VERSION >= 6000000) && (__ARMCC_VERSION < 7000000))
-# define __IS_COMPILER_ARM_COMPILER_6__ 1
-#endif
-
-#ifdef __IS_COMPILER_LLVM__
-# undef __IS_COMPILER_LLVM__
-#endif
-#if defined(__clang__) && !__IS_COMPILER_ARM_COMPILER_6__
-# define __IS_COMPILER_LLVM__ 1
-#else
-//! \note for gcc
-#ifdef __IS_COMPILER_GCC__
-# undef __IS_COMPILER_GCC__
-#endif
-#if defined(__GNUC__) && !(__IS_COMPILER_ARM_COMPILER_6__ || __IS_COMPILER_LLVM__)
-# define __IS_COMPILER_GCC__ 1
-#endif
-//! @}
-#endif
-//! @}
-
-#if defined(ARMCM33_DSP_FP) && defined(__IS_COMPILER_GCC__)
-extern "C" void _exit(int return_code);
-#endif
-
 
 int main()
 {
  int r;
 
  r=testmain(patternData);
 
- /* 
-
- Temporary solution to solve problems with IPSS support for M33.
-
- */
-
- #if defined(ARMCM33_DSP_FP) && defined(__IS_COMPILER_GCC__)
- _exit(r);
- #endif
-
- return(r);
+ exit(r);
 }