Просмотр исходного кода

is_test_log_complete handles more test types

[SVN r36853]
Misha Bergal 19 лет назад
Родитель
Сommit
59e7523295

+ 5 - 0
tools/regression/xsl_reports/test/test-components/test_is_test_log_complete/expected/lib.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tests>
+<result name="" target-directory="boost/bin.v2/libs/date_time/build/borland-5.8.2/debug" result="true"/>
+<result name="" target-directory="boost/bin.v2/libs/date_time/build/borland-5.8.2/debug" result="false"/>
+</tests>

+ 6 - 0
tools/regression/xsl_reports/test/test-components/test_is_test_log_complete/expected/run_pyd.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<tests>
+<result name="python_test" target-directory="boost/bin.v2/libs/parameter/test/python_test.test/msvc-8.0/rls/adrs-mdl-64/instr-set-optrn/thrd-mlt" result="true"/>
+<result name="python_test" target-directory="boost/bin.v2/libs/parameter/test/python_test.test/msvc-8.0/rls/adrs-mdl-64/instr-set-optrn/thrd-mlt" result="false"/>
+
+</tests>

+ 42 - 0
tools/regression/xsl_reports/test/test-components/test_is_test_log_complete/lib.xml

@@ -0,0 +1,42 @@
+<tests>
+<test-log library="date_time" test-program="" show-run-output="true" toolset="borland-5.8.2" test-type="lib" test-name="" target-directory="boost/bin.v2/libs/date_time/build/borland-5.8.2/debug">
+<compile timestamp="2007-01-30 00:50:48 UTC" result="succeed">
+"C:/Programme/Borland/BDS/4.0/Bin/bcc32.exe" -j5 -g255 -q -c -P -Ve -Vx -a8 -b- -IX:/spirit-1.6.3/boost -v -Od -tWC -tWR -tWC -tWD -WM- -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DDATE_TIME_INLINE -I".." -I"C:/Programme/Borland/BDS/4.0/include/" -o"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\date_generators.obj" "..\libs\date_time\src\gregorian\date_generators.cpp"
+
+..\libs\date_time\src\gregorian\date_generators.cpp:
+
+file X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.dll.rsp
+
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\greg_month.obj"
+ 
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\greg_weekday.obj"
+ 
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\date_generators.obj"
+   
+</compile>
+<link timestamp="2007-01-30 00:50:48 UTC" result="succeed">
+
+    set "PATH=C:/Programme/Borland/BDS/4.0/bin/;%PATH%"
+       "C:/Programme/Borland/BDS/4.0/Bin/bcc32.exe" -v -q -v -v -tWD -tWC -tWR -tWC -tWD -WM-  -L"C:/Programme/Borland/BDS/4.0/lib" -e"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.dll" @"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.dll.rsp"  &amp;&amp; "C:/Programme/Borland/BDS/4.0/bin/implib" "X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.lib" "X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.dll"
+
+
+Borland Implib Version 3.0.22 Copyright (c) 1991, 2000 Inprise Corporation
+</link>
+</test-log>
+<test-log library="date_time" test-program="" show-run-output="true" toolset="borland-5.8.2" test-type="lib" test-name="" target-directory="boost/bin.v2/libs/date_time/build/borland-5.8.2/debug">
+<compile timestamp="2007-01-30 00:50:48 UTC" result="succeed">
+"C:/Programme/Borland/BDS/4.0/Bin/bcc32.exe" -j5 -g255 -q -c -P -Ve -Vx -a8 -b- -IX:/spirit-1.6.3/boost -v -Od -tWC -tWR -tWC -tWD -WM- -DBOOST_ALL_DYN_LINK=1 -DBOOST_ALL_NO_LIB=1 -DDATE_TIME_INLINE -I".." -I"C:/Programme/Borland/BDS/4.0/include/" -o"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\date_generators.obj" "..\libs\date_time\src\gregorian\date_generators.cpp"
+
+..\libs\date_time\src\gregorian\date_generators.cpp:
+
+file X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\boost_date_time-bcb-d-1_34.dll.rsp
+
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\greg_month.obj"
+ 
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\greg_weekday.obj"
+ 
+"X:\boost-regression\results\boost\bin.v2\libs\date_time\build\borland-5.8.2\debug\date_generators.obj"
+   
+</compile>
+</test-log>
+</tests>

+ 57 - 0
tools/regression/xsl_reports/test/test-components/test_is_test_log_complete/run_pyd.xml

@@ -0,0 +1,57 @@
+<tests>
+<test-log library="parameter" test-program="libs/parameter/test/python_test.py" show-run-output="false" toolset="msvc-8.0" test-type="run_pyd" test-name="python_test" target-directory="boost/bin.v2/libs/parameter/test/python_test.test/msvc-8.0/rls/adrs-mdl-64/instr-set-optrn/thrd-mlt">
+<compile timestamp="2007-01-30 05:09:28 UTC" result="succeed">
+call "C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat" amd64 &gt;nul
+cl /Zm800 -nologo @"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test.obj.rsp" 
+
+python_test.cpp
+
+file Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.rsp
+
+"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test.obj"
+ 
+"Z:\results\boost\bin.v2\libs\python\build\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\boost_python-vc80-mt-1_34.lib"
+    
+</compile>
+<link timestamp="2007-01-30 05:09:28 UTC" result="succeed">
+call "C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat" amd64 &gt;nul
+link /NOLOGO /INCREMENTAL:NO /DLL /subsystem:console /out:"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd" /IMPLIB:"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.lib" /LIBPATH:"c:\python25\libs"   @"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.rsp"
+        if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+        if exist "Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.manifest" (
+            mt -nologo -manifest "Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.manifest" "-outputresource:Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd;2"
+        )
+    
+   Creating library Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.lib and object Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.exp
+</link>
+<run timestamp="2007-01-30 05:09:28 UTC" result="succeed">
+ 
+EXIT STATUS: 0 
+</run>
+</test-log>
+<test-log library="parameter" test-program="libs/parameter/test/python_test.py" show-run-output="false" toolset="msvc-8.0" test-type="run_pyd" test-name="python_test" target-directory="boost/bin.v2/libs/parameter/test/python_test.test/msvc-8.0/rls/adrs-mdl-64/instr-set-optrn/thrd-mlt">
+<compile timestamp="2007-01-30 05:09:28 UTC" result="succeed">
+call "C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat" amd64 &gt;nul
+cl /Zm800 -nologo @"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test.obj.rsp" 
+
+python_test.cpp
+
+file Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.rsp
+
+"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test.obj"
+ 
+"Z:\results\boost\bin.v2\libs\python\build\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\boost_python-vc80-mt-1_34.lib"
+    
+</compile>
+<link timestamp="2007-01-30 05:09:28 UTC" result="succeed">
+call "C:\Program Files (x86)\Microsoft Visual Studio 8\VC\vcvarsall.bat" amd64 &gt;nul
+link /NOLOGO /INCREMENTAL:NO /DLL /subsystem:console /out:"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd" /IMPLIB:"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.lib" /LIBPATH:"c:\python25\libs"   @"Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.rsp"
+        if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
+        if exist "Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.manifest" (
+            mt -nologo -manifest "Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd.manifest" "-outputresource:Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext.pyd;2"
+        )
+    
+   Creating library Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.lib and object Z:\results\boost\bin.v2\libs\parameter\test\python_test.test\msvc-8.0\rls\adrs-mdl-64\instr-set-optrn\thrd-mlt\python_test_ext-vc80-mt-1_34.exp
+</link>
+</test-log>
+
+</tests>

+ 3 - 3
tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl

@@ -33,14 +33,14 @@ http://www.boost.org/LICENSE_1_0.txt)
                 <xsl:when test="$type='compile' or $type='compile_fail'  or $test_log/compile/@result='fail' ">
                     <xsl:value-of select="count( $test_log/compile ) = 1 and count( $test_log/link) = 0 and count( $test_log/run) = 0"/>
                 </xsl:when>
-                <xsl:when test="$type='link' or $type='link_fail' or $type='' or $test_log/link/@result='fail' ">
+                <xsl:when test="$type='link' or $type='link_fail' or $type='' or $type='lib' or $test_log/link/@result='fail'">
                     <xsl:value-of select="count( $test_log/compile) = 1  and count( $test_log/link) = 1 and count( $test_log/run) = 0"/></xsl:when>
-                <xsl:when test="$type='run' or $type='run_fail' ">
+                <xsl:when test="$type='run' or $type='run_fail' or $type='run_pyd'">
                     <xsl:value-of select="count( $test_log/compile) = 1  and count( $test_log/link)  = 1 and count($test_log/run) = 1 "/>
                 </xsl:when>
                 <xsl:otherwise> 
                     <xsl:message terminate="yes">
-                        Unknown test type "<xsl:value-of select="$type"/>
+                        Unknown test type "<xsl:value-of select="$type"/>"
                     </xsl:message>
                 </xsl:otherwise>
             </xsl:choose>

粤ICP备19079148号