Always query test output for test stage in makereport.py, only provide one build...

git-svn-id: https://svn.dealii.org/trunk@31359 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/a-framework/build_1.cc b/tests/a-framework/build.cc
similarity index 100%
rename from tests/a-framework/build_1.cc
rename to tests/a-framework/build.cc

diff --git a/tests/a-framework/build_1.expect=build.output b/tests/a-framework/build.expect=build.output
similarity index 100%
rename from tests/a-framework/build_1.expect=build.output
rename to tests/a-framework/build.expect=build.output

diff --git a/tests/a-framework/build_2.cc b/tests/a-framework/build_2.cc
deleted file mode 100644 (file)
index cd3609c..0000000
--- a/tests/a-framework/build_2.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-// ---------------------------------------------------------------------
-// $Id: compile.cc 30508 2013-08-27 17:01:42Z turcksin $
-//
-// Copyright (C) 2010 - 2013 by the deal.II authors
-//
-// This file is part of the deal.II library.
-//
-// The deal.II library is free software; you can use it, redistribute
-// it, and/or modify it under the terms of the GNU Lesser General
-// Public License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-// The full text of the license can be found in the file LICENSE at
-// the top level of the deal.II distribution.
-//
-// ---------------------------------------------------------------------
-
-
-
-// test the testsuite framework. this test is supposed to compile
-// successfully but not link
-
-#include "../tests.h"
-#include <deal.II/base/logstream.h>
-#include <fstream>
-#include <cstdlib>
-
-void function_that_does_not_exist ();
-
-
-int main ()
-{
-  std::ofstream logfile("output");
-  deallog.attach(logfile);
-  deallog.depth_console(0);
-
-  function_that_does_not_exist ();
-
-  deallog << "OK" << std::endl;
-}
-

diff --git a/tests/a-framework/build_2.expect=build.output b/tests/a-framework/build_2.expect=build.output
deleted file mode 100644 (file)
index 0fd8fc1..0000000
--- a/tests/a-framework/build_2.expect=build.output
+++ /dev/null
@@ -1,2 +0,0 @@
-
-DEAL::OK

diff --git a/tests/scripts/makereport.py b/tests/scripts/makereport.py
index 7a49eef091da7bf674d4a265a45200f14ac30a52..5295c47f870c33aea527b876b61d10c56520442f 100644 (file)
--- a/tests/scripts/makereport.py
+++ b/tests/scripts/makereport.py
@@ -69,31 +69,26 @@ testing = root.find('Testing')
 tests={}
 
 for test in testing.findall("Test"):
-    status = test.attrib['Status']
-    fail=False
-    if status=="failed": fail=True
     name = test.find('Name').text
     group = name.split('/')[0]
 
     if group=="all-headers":
         name = group + "/" + "-".join(name.split('/')[1:])
 
-    status = 4
-    if fail:
-        text = test.find('Results').find('Measurement').find('Value').text
-        if text == None: text=""
-        failtext = text.encode('utf-8')
-        failtextlines = failtext.replace('"','').split('\n')
-        failstatustxt = failtextlines[0].split(' ')[-1]
-        statuslist=['CONFIGURE','BUILD','RUN','DIFF']
-        if failstatustxt in statuslist:
-            status = statuslist.index(failstatustxt)
-        else:
-            for meas in test.find('Results').findall('NamedMeasurement'):
-                if (meas.attrib["name"]=="Exit Code" and meas.find('Value').text=="Timeout"):
-                    status=3
-
-            if status==4:
+    text = test.find('Results').find('Measurement').find('Value').text
+    if text == None: text=""
+    failtext = text.encode('utf-8')
+    failtextlines = failtext.replace('"','').split('\n')
+    failstatustxt = failtextlines[0].split(' ')[-1]
+
+    statuslist=['CONFIGURE','BUILD','RUN','DIFF','PASSED']
+    if failstatustxt in statuslist:
+        status = statuslist.index(failstatustxt)
+    else:
+        for meas in test.find('Results').findall('NamedMeasurement'):
+            if (meas.attrib["name"]=="Exit Code" and meas.find('Value').text=="Timeout"):
+                status=3
+            else:
                 print >>sys.stderr, "unknown status '%s' in test %s "% (failstatustxt,name)
                 status=0