From 1f4fc097ce4a065e605266d54e72d3e3f88b8193 Mon Sep 17 00:00:00 2001 From: Bruno Turcksin Date: Tue, 27 Aug 2013 17:01:42 +0000 Subject: [PATCH] Convert a-framework tests to ctest. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30508 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/CMakeLists.txt | 2 +- tests/a-framework/CMakeLists.txt | 1 + tests/a-framework/Makefile | 10 ---------- tests/a-framework/compile.cc | 2 +- .../{compile/cmp/generic => compile.output} | 0 tests/a-framework/fail.cc | 2 +- tests/a-framework/{fail/cmp/generic => fail.output} | 0 tests/a-framework/link.cc | 2 +- tests/a-framework/{link/cmp/generic => link.output} | 0 tests/a-framework/miscompare.cc | 2 +- .../{miscompare/cmp/generic => miscompare.output} | 0 tests/a-framework/run.cc | 2 +- tests/a-framework/{run/cmp/generic => run.output} | 0 13 files changed, 7 insertions(+), 16 deletions(-) create mode 100644 tests/a-framework/CMakeLists.txt delete mode 100644 tests/a-framework/Makefile rename tests/a-framework/{compile/cmp/generic => compile.output} (100%) rename tests/a-framework/{fail/cmp/generic => fail.output} (100%) rename tests/a-framework/{link/cmp/generic => link.output} (100%) rename tests/a-framework/{miscompare/cmp/generic => miscompare.output} (100%) rename tests/a-framework/{run/cmp/generic => run.output} (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 92ef09dd51..4c1d6234d1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -72,7 +72,7 @@ MESSAGE(STATUS "Proceed to test definitions") #$(if $(USE_CONTRIB_SLEPC:no=), slepc,) \ #$(if $(USE_CONTRIB_TRILINOS:no=), trilinos,) \ -#a-framework +ADD_SUBDIRECTORY(a-framework) ADD_SUBDIRECTORY(aniso) ADD_SUBDIRECTORY(base) ADD_SUBDIRECTORY(bits) diff --git a/tests/a-framework/CMakeLists.txt b/tests/a-framework/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/a-framework/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS() diff --git a/tests/a-framework/Makefile b/tests/a-framework/Makefile deleted file mode 100644 index 3dc8d027c4..0000000000 --- a/tests/a-framework/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -############################################################ -# Makefile,v 1.15 2002/06/13 12:51:13 hartmann Exp -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by the deal.II authors -############################################################ - -include ../Makefile.paths -include $D/common/Make.global_options -include ../Makefile.rules --include Makefile.depend --include Makefile.tests diff --git a/tests/a-framework/compile.cc b/tests/a-framework/compile.cc index 2a85bf623a..9c89402fc6 100644 --- a/tests/a-framework/compile.cc +++ b/tests/a-framework/compile.cc @@ -29,7 +29,7 @@ void function_that_does_not_exist (); int main () { - std::ofstream logfile("compile/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/a-framework/compile/cmp/generic b/tests/a-framework/compile.output similarity index 100% rename from tests/a-framework/compile/cmp/generic rename to tests/a-framework/compile.output diff --git a/tests/a-framework/fail.cc b/tests/a-framework/fail.cc index d564110b2c..189749ba1b 100644 --- a/tests/a-framework/fail.cc +++ b/tests/a-framework/fail.cc @@ -27,7 +27,7 @@ int main () { - std::ofstream logfile("fail/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/a-framework/fail/cmp/generic b/tests/a-framework/fail.output similarity index 100% rename from tests/a-framework/fail/cmp/generic rename to tests/a-framework/fail.output diff --git a/tests/a-framework/link.cc b/tests/a-framework/link.cc index d2da112194..271afee5c0 100644 --- a/tests/a-framework/link.cc +++ b/tests/a-framework/link.cc @@ -27,7 +27,7 @@ int main () { - std::ofstream logfile("link/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/a-framework/link/cmp/generic b/tests/a-framework/link.output similarity index 100% rename from tests/a-framework/link/cmp/generic rename to tests/a-framework/link.output diff --git a/tests/a-framework/miscompare.cc b/tests/a-framework/miscompare.cc index 496f97b4fa..c45318ec88 100644 --- a/tests/a-framework/miscompare.cc +++ b/tests/a-framework/miscompare.cc @@ -27,7 +27,7 @@ int main () { - std::ofstream logfile("miscompare/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/a-framework/miscompare/cmp/generic b/tests/a-framework/miscompare.output similarity index 100% rename from tests/a-framework/miscompare/cmp/generic rename to tests/a-framework/miscompare.output diff --git a/tests/a-framework/run.cc b/tests/a-framework/run.cc index 737431af4e..b41280978b 100644 --- a/tests/a-framework/run.cc +++ b/tests/a-framework/run.cc @@ -25,7 +25,7 @@ int main () { - std::ofstream logfile("run/output"); + std::ofstream logfile("output"); deallog.attach(logfile); deallog.depth_console(0); diff --git a/tests/a-framework/run/cmp/generic b/tests/a-framework/run.output similarity index 100% rename from tests/a-framework/run/cmp/generic rename to tests/a-framework/run.output -- 2.39.5