فهرست منبع

Be more verbose about native tests; disable native tests in reduced test runs (-dirs -tags -nottags)

Doug Ilijev 8 سال پیش
والد
کامیت
7a2631809e
2فایلهای تغییر یافته به همراه22 افزوده شده و 1 حذف شده
  1. 15 0
      test/jenkins.parsetestargs.cmd
  2. 7 1
      test/jenkins.testone.cmd

+ 15 - 0
test/jenkins.parsetestargs.cmd

@@ -57,6 +57,21 @@ if not "%1"=="" (
         goto :ContinueArgParse
     )
 
+    if "%1"=="-dirs" (
+        set _ReducedTestRun=1
+        REM fallthrough to default (also add this to %_ExtraTestArgs%)
+    )
+
+    if "%1"=="-tags" (
+        set _ReducedTestRun=1
+        REM fallthrough to default (also add this to %_ExtraTestArgs%)
+    )
+
+    if "%1"=="-nottags" (
+        set _ReducedTestRun=1
+        REM fallthrough to default (also add this to %_ExtraTestArgs%)
+    )
+
     if "%1"=="-disablejit" (
         set _SpecialBuild=.NoJIT
         REM fallthrough to default (also add this to %_ExtraTestArgs%)

+ 7 - 1
test/jenkins.testone.cmd

@@ -52,7 +52,11 @@ set _HadFailures=0
   call :doSilent rd /s/q %_LogDir%
 
   call :runTests %_TestArgs%
-  call :runNativeTests %_TestArgs%
+  if "%_ReducedTestRun%" == "1" (
+    echo -- jenkins.testone.cmd ^>^> Reduced test run: skipping native tests.
+  ) else (
+    call :runNativeTests %_TestArgs%
+  )
 
   call :summarizeLogs
 
@@ -85,7 +89,9 @@ set _HadFailures=0
 :: ============================================================================
 :runNativeTests
 
+  echo -- jenkins.testone.cmd ^>^> Running native tests... (this can take some time)
   call :do %_TestDir%\runnativetests.cmd -%1 -binDir %_BinDir% > %_LogDir%\nativetests.log 2>&1
+  echo -- jenkins.testone.cmd ^>^> Running native tests... DONE!
 
   if ERRORLEVEL 1 set _HadFailures=1