From 485f5524a466c3e95a7bc4389983f170ea1f015f Mon Sep 17 00:00:00 2001 From: maier Date: Sun, 20 Oct 2013 17:49:48 +0000 Subject: [PATCH] Add a-framework git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@31343 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/a-framework/CMakeLists.txt | 5 +++++ tests/a-framework/{fail.cc => build_1.cc} | 5 ++--- .../{compile.output => build_1.expect=build.output} | 0 tests/a-framework/{compile.cc => build_2.cc} | 2 +- .../{fail.output => build_2.expect=build.output} | 0 tests/a-framework/{miscompare.cc => diff.cc} | 6 +++--- .../a-framework/{link.output => diff.expect=diff.output} | 0 tests/a-framework/{link.cc => passed.cc} | 8 ++------ tests/a-framework/{miscompare.output => passed.output} | 0 tests/a-framework/run.cc | 6 +++++- tests/a-framework/{run.output => run.expect=run.output} | 0 11 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 tests/a-framework/CMakeLists.txt rename tests/a-framework/{fail.cc => build_1.cc} (88%) rename tests/a-framework/{compile.output => build_1.expect=build.output} (100%) rename tests/a-framework/{compile.cc => build_2.cc} (94%) rename tests/a-framework/{fail.output => build_2.expect=build.output} (100%) rename tests/a-framework/{miscompare.cc => diff.cc} (85%) rename tests/a-framework/{link.output => diff.expect=diff.output} (100%) rename tests/a-framework/{link.cc => passed.cc} (85%) rename tests/a-framework/{miscompare.output => passed.output} (100%) rename tests/a-framework/{run.output => run.expect=run.output} (100%) diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt new file mode 100644 index 0000000000..e39c51b85d --- /dev/null +++ b/tests/a-framework/CMakeLists.txt @@ -0,0 +1,5 @@ +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8) +INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsuite.cmake) +PROJECT(testsuite CXX) +INCLUDE(${DEAL_II_TARGET_CONFIG}) +DEAL_II_PICKUP_TESTS() diff --git a/tests/a-framework/fail.cc b/tests/a-framework/build_1.cc similarity index 88% rename from tests/a-framework/fail.cc rename to tests/a-framework/build_1.cc index 189749ba1b..895a50f0c0 100644 --- a/tests/a-framework/fail.cc +++ b/tests/a-framework/build_1.cc @@ -1,5 +1,5 @@ // --------------------------------------------------------------------- -// $Id$ +// $Id: fail.cc 30508 2013-08-27 17:01:42Z turcksin $ // // Copyright (C) 2010 - 2013 by the deal.II authors // @@ -16,8 +16,7 @@ -// test the testsuite framework. this test is supposed to compile and link -// successfully but not run +// test the testsuite framework. this test is supposed to miscompile #include "../tests.h" #include diff --git a/tests/a-framework/compile.output b/tests/a-framework/build_1.expect=build.output similarity index 100% rename from tests/a-framework/compile.output rename to tests/a-framework/build_1.expect=build.output diff --git a/tests/a-framework/compile.cc b/tests/a-framework/build_2.cc similarity index 94% rename from tests/a-framework/compile.cc rename to tests/a-framework/build_2.cc index 9c89402fc6..cd3609c32b 100644 --- a/tests/a-framework/compile.cc +++ b/tests/a-framework/build_2.cc @@ -1,5 +1,5 @@ // --------------------------------------------------------------------- -// $Id$ +// $Id: compile.cc 30508 2013-08-27 17:01:42Z turcksin $ // // Copyright (C) 2010 - 2013 by the deal.II authors // diff --git a/tests/a-framework/fail.output b/tests/a-framework/build_2.expect=build.output similarity index 100% rename from tests/a-framework/fail.output rename to tests/a-framework/build_2.expect=build.output diff --git a/tests/a-framework/miscompare.cc b/tests/a-framework/diff.cc similarity index 85% rename from tests/a-framework/miscompare.cc rename to tests/a-framework/diff.cc index c45318ec88..e229bf2225 100644 --- a/tests/a-framework/miscompare.cc +++ b/tests/a-framework/diff.cc @@ -1,5 +1,5 @@ // --------------------------------------------------------------------- -// $Id$ +// $Id: miscompare.cc 30508 2013-08-27 17:01:42Z turcksin $ // // Copyright (C) 2010 - 2013 by the deal.II authors // @@ -16,8 +16,8 @@ -// test the testsuite framework. this test is supposed to compile successfully -// but not run +// test the testsuite framework. this test is supposed to run succesfully +// but to miscompare #include "../tests.h" #include diff --git a/tests/a-framework/link.output b/tests/a-framework/diff.expect=diff.output similarity index 100% rename from tests/a-framework/link.output rename to tests/a-framework/diff.expect=diff.output diff --git a/tests/a-framework/link.cc b/tests/a-framework/passed.cc similarity index 85% rename from tests/a-framework/link.cc rename to tests/a-framework/passed.cc index 271afee5c0..34ee2be947 100644 --- a/tests/a-framework/link.cc +++ b/tests/a-framework/passed.cc @@ -1,5 +1,5 @@ // --------------------------------------------------------------------- -// $Id$ +// $Id: run.cc 30508 2013-08-27 17:01:42Z turcksin $ // // Copyright (C) 2010 - 2013 by the deal.II authors // @@ -16,13 +16,11 @@ -// test the testsuite framework. this test is supposed to compile and link -// successfully but not run +// test the testsuite framework. this test is supposed to run successfully #include "../tests.h" #include #include -#include int main () @@ -31,8 +29,6 @@ int main () deallog.attach(logfile); deallog.depth_console(0); - std::abort (); - deallog << "OK" << std::endl; } diff --git a/tests/a-framework/miscompare.output b/tests/a-framework/passed.output similarity index 100% rename from tests/a-framework/miscompare.output rename to tests/a-framework/passed.output diff --git a/tests/a-framework/run.cc b/tests/a-framework/run.cc index b41280978b..271afee5c0 100644 --- a/tests/a-framework/run.cc +++ b/tests/a-framework/run.cc @@ -16,11 +16,13 @@ -// test the testsuite framework. this test is supposed to run successfully +// test the testsuite framework. this test is supposed to compile and link +// successfully but not run #include "../tests.h" #include #include +#include int main () @@ -29,6 +31,8 @@ int main () deallog.attach(logfile); deallog.depth_console(0); + std::abort (); + deallog << "OK" << std::endl; } diff --git a/tests/a-framework/run.output b/tests/a-framework/run.expect=run.output similarity index 100% rename from tests/a-framework/run.output rename to tests/a-framework/run.expect=run.output -- 2.39.5