]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
remove abort.cc and adjust reference files
authorkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Jul 2006 12:45:54 +0000 (12:45 +0000)
committerkanschat <kanschat@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 19 Jul 2006 12:45:54 +0000 (12:45 +0000)
git-svn-id: https://svn.dealii.org/trunk@13395 0785d39b-7218-0410-832d-ea1e28bc413d

tests/Makefile
tests/Makefile.rules
tests/abort.cc [deleted file]
tests/base/reference.cc
tests/base/reference/cmp/x86_64-unknown-linux-gnu+gcc4.0 [new file with mode: 0644]
tests/base/slice_vector.cc
tests/bits/accessor_equality/cmp/generic

index 366fd0ee926378b7e3d2670a052218e799bfe600..2bbdfd403fb42c23493ac3bd9857b4ff07c70547 100644 (file)
@@ -4,34 +4,34 @@
 
 all: base lac fe deal.II multigrid bits
 
-base: abort.o
+base:
        cd base ; $(MAKE)
 
-lac: abort.o
+lac:
        cd lac ; $(MAKE)
 
-fe: abort.o
+fe:
        cd fe ; $(MAKE)
 
-bits: abort.o
+bits:
        cd bits ; $(MAKE)
 
-deal.II: abort.o
+deal.II:
        cd deal.II ; $(MAKE)
 
-multigrid: abort.o
+multigrid:
        cd multigrid ; $(MAKE)
 
-hp: abort.o
+hp:
        cd hp ; $(MAKE)
 
-report: abort.o
+report:
        @for i in base lac fe deal.II multigrid bits hp all-headers ; do \
                echo =======Report: $$i ======= ; \
                cd $$i ; $(MAKE) report ; cd .. ; \
         done
 
-report+mail: abort.o
+report+mail:
        @for i in base lac fe deal.II multigrid bits hp all-headers ; do \
                echo =======Report: $$i ======= ; \
                cd $$i ; $(MAKE) report+mail ; cd .. ; \
@@ -42,25 +42,25 @@ report+mail: abort.o
 
 build: build-base build-lac build-fe build-deal.II build-multigrid build-bits build-hp
 
-build-base: abort.o
+build-base:
        cd base ; $(MAKE) build
 
-build-lac: abort.o
+build-lac:
        cd lac ; $(MAKE) build
 
-build-fe: abort.o
+build-fe:
        cd fe ; $(MAKE) build
 
-build-bits: abort.o
+build-bits:
        cd bits ; $(MAKE) build
 
-build-deal.II: abort.o
+build-deal.II:
        cd deal.II ; $(MAKE) build
 
-build-multigrid: abort.o
+build-multigrid:
        cd multigrid ; $(MAKE) build
 
-build-hp: abort.o
+build-hp:
        cd hp ; $(MAKE) build
 
 
@@ -69,25 +69,25 @@ build-hp: abort.o
 
 output: output-base output-lac output-fe output-deal.II output-bits output-hp
 
-output-base: abort.o
+output-base:
        cd base ; $(MAKE) output
 
-output-lac: abort.o
+output-lac:
        cd lac ; $(MAKE) output
 
-output-fe: abort.o
+output-fe:
        cd fe ; $(MAKE) output
 
-output-bits: abort.o
+output-bits:
        cd bits ; $(MAKE) output
 
-output-deal.II: abort.o
+output-deal.II:
        cd deal.II ; $(MAKE) output
 
-output-multigrid: abort.o
+output-multigrid:
        cd multigrid ; $(MAKE) output
 
-output-hp: abort.o
+output-hp:
        cd hp ; $(MAKE) output
 
 
@@ -96,25 +96,25 @@ output-hp: abort.o
 
 refs: refs-base refs-lac refs-fe refs-deal.II refs-bits refs-hp
 
-refs-base: abort.o
+refs-base:
        cd base ; $(MAKE) refs
 
-refs-lac: abort.o
+refs-lac:
        cd lac ; $(MAKE) refs
 
-refs-fe: abort.o
+refs-fe:
        cd fe ; $(MAKE) refs
 
-refs-bits: abort.o
+refs-bits:
        cd bits ; $(MAKE) refs
 
-refs-deal.II: abort.o
+refs-deal.II:
        cd deal.II ; $(MAKE) refs
 
-refs-multigrid: abort.o
+refs-multigrid:
        cd multigrid ; $(MAKE) refs
 
-refs-hp: abort.o
+refs-hp:
        cd hp ; $(MAKE) refs
 
 
@@ -123,10 +123,8 @@ resultname:
        @echo $(TARGET)+$(GXX-VERSION)
 
 clean: clean-base clean-lac clean-deal.II clean-fe clean-bits clean-hp
-       -rm -f abort.o
 
 distclean: distclean-base distclean-lac distclean-deal.II distclean-fe distclean-bits distclean-hp
-       -rm -f abort.o
 
 clean-base:
        cd base ; $(MAKE) clean
@@ -170,10 +168,6 @@ clean-hp:
 distclean-hp:
        cd hp ; $(MAKE) distclean
 
-
-abort.o: abort.cc
-        @$(CXX) $(CXXFLAGS.g) -o $@ -c $<
-
 .PHONY : all base lac fe deal.II multigrid bits \
        clean clean-base clean-lac clean-fe \
        clean-deal.II clean-multigrid clean-bits clean-hp \
index 6f80292610fa411d3bf0d32ffcce53eb292b0f53..1cbe87da6dca81b62ee075539586ed662096d4de 100644 (file)
@@ -42,7 +42,7 @@ endif
 ######################################################################
 %/exe : %/obj.g.$(OBJEXT)
        @echo =====linking======= $@
-       @$(CXX) $(LDFLAGS) -o $@ ../abort.o $^ $(LIBS)
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 ############################################################
diff --git a/tests/abort.cc b/tests/abort.cc
deleted file mode 100644 (file)
index af2f137..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-//-----------------------------------------------------------------------
-//    $Id$
-//    Version: $Name$
-//
-//    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 by the deal.II authors
-//
-//    This file is subject to QPL and may not be  distributed
-//    without copyright and license information. Please refer
-//    to the file deal.II/doc/license.html for the  text  and
-//    further information on this license.
-//
-//-----------------------------------------------------------------------
-
-
-// when linking with the object file generated from this file, calling
-// aborts() will not abort the program, but simply resume
-// operation. while usually useless, this is used in the test to
-// generate the output of a triggered assertion without aborting the
-// program. we do this, since we sometimes want to test that some code
-// actually generates an assertion, which would otherwise be
-// impossible
-
-#include <base/logstream.h>
-
-namespace  deal_II_exceptions
-{
-  namespace internals 
-  {
-    extern unsigned int n_treated_exceptions;
-  }
-}
-
-extern "C"
-void abort()
-#ifdef DEAL_II_ABORT_NOTHROW_EXCEPTION
-  throw ()
-#endif
-{
-  deallog << "Abort!!!" << std::endl;
-  deal_II_exceptions::internals::n_treated_exceptions = 0;
-}
index a581f97f4443659be5c67ed49d975a62862d0749..038476f31736083592906c3513f0d26f11a86ca5 100644 (file)
@@ -43,31 +43,7 @@ int main()
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
-
-                                   // we do something rather weird in
-                                   // this file: bind the buffer of
-                                   // cerr to the log file, so that
-                                   // the output of the Assert* macros
-                                   // that are written to std::cerr
-                                   // end up in the logfiles.
-                                   //
-                                   // so make sure we store a pointer
-                                   // to the old buffer, switch to the
-                                   // buffer of the logfile, and at
-                                   // the end of main() switch
-                                   // back. note that if we don't
-                                   // switch back, we get a segfault
-                                   // later on in the destruction of
-                                   // std::cerr, since it tries to do
-                                   // something with its buffer, but
-                                   // that is already gone by then
-#if __GNUC__ != 2
-  std::basic_streambuf<char> *old_cerr_buf = std::cerr.rdbuf();
-#else
-  streambuf *old_cerr_buf = std::cerr.rdbuf();
-#endif
-  std::cerr.rdbuf(logfile.rdbuf());
-
+  
   if (true)
     {
       Test a("A");
@@ -99,6 +75,5 @@ int main()
       Test d("D");
       r = &d;
     }
-  std::cerr.rdbuf(old_cerr_buf);
 }
 
diff --git a/tests/base/reference/cmp/x86_64-unknown-linux-gnu+gcc4.0 b/tests/base/reference/cmp/x86_64-unknown-linux-gnu+gcc4.0
new file mode 100644 (file)
index 0000000..f6cb286
--- /dev/null
@@ -0,0 +1,16 @@
+
+DEAL::Construct A
+DEAL::Construct B
+DEAL::a mutable
+DEAL::b const
+DEAL::r mutable
+DEAL::s const
+DEAL::t mutable
+DEAL::u const
+DEAL::Construct C
+DEAL::Construct D
+DEAL::Destruct D
+DEAL::ExcInUse(counter, object_info->name(), infostring)
+DEAL::Destruct C
+DEAL::Destruct B
+DEAL::Destruct A
index 0bd48d878e361b94532d0005c10685a74e2f99e9..54776a2cc000073143edc14db37f37ae1b1b7905 100644 (file)
@@ -26,8 +26,8 @@ void f(const std::vector<int>& v)
     s = make_slice(v,2,3);
   
   for (unsigned int i=0;i<s.size();++i)
-    std::cerr << '\t' << s[i];
-  std::cerr << std::endl;
+    deallog << '\t' << s[i];
+  deallog << std::endl;
 }
 
 
@@ -38,30 +38,6 @@ int main()
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog.threshold_double(1.e-10);
-
-                                   // we do something rather weird in
-                                   // this file: bind the buffer of
-                                   // cerr to the log file, so that
-                                   // the output of the Assert* macros
-                                   // that are written to std::cerr
-                                   // end up in the logfiles.
-                                   //
-                                   // so make sure we store a pointer
-                                   // to the old buffer, switch to the
-                                   // buffer of the logfile, and at
-                                   // the end of main() switch
-                                   // back. note that if we don't
-                                   // switch back, we get a segfault
-                                   // later on in the destruction of
-                                   // std::cerr, since it tries to do
-                                   // something with its buffer, but
-                                   // that is already gone by then
-#if __GNUC__ != 2
-  std::basic_streambuf<char> *old_cerr_buf = std::cerr.rdbuf();
-#else
-  streambuf *old_cerr_buf = std::cerr.rdbuf();
-#endif
-  std::cerr.rdbuf(logfile.rdbuf());
   
   std::vector<int> v(7);
 
@@ -82,6 +58,4 @@ int main()
   make_slice(v, 3, 5);
   int n = s[4];
   n += 3;
-
-  std::cerr.rdbuf(old_cerr_buf);
 }
index e3bb30c412583d667017f7e6167cc9823d93933c..9f3bf94cb49c62f951eeb70793f09eff80a381e0 100644 (file)
@@ -1,7 +1,10 @@
 
 DEAL::1d
 DEAL::1.0
+DEAL::ExcCantCompareIterators()
 DEAL::2d
 DEAL::1.0
+DEAL::ExcCantCompareIterators()
 DEAL::3d
 DEAL::1.0
+DEAL::ExcCantCompareIterators()

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.