Prevent drop database failure from showing.

diff --git a/src/include/c.h b/src/include/c.h
index ea96d87b911de1efb8c5b690fca2e28ce34f6c7c..af895f8bac37efa1095e12ae1d4725f49c928f07 100644 (file)
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: c.h,v 1.66 2000/03/20 04:02:46 momjian Exp $
+ * $Id: c.h,v 1.67 2000/04/12 05:24:50 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -531,9 +531,11 @@ typedef struct Exception
  *
  */
 #define Trap(condition, exception) \
-               { if ((assert_enabled) && (condition)) \
+               do { \
+                       if ((assert_enabled) && (condition)) \
                                ExceptionalCondition(CppAsString(condition), &(exception), \
-                                               (char*)NULL, __FILE__, __LINE__); }
+                                               (char*)NULL, __FILE__, __LINE__); \
+               } while (0)
 
 /*
  *     TrapMacro is the same as Trap but it's intended for use in macros:
@@ -577,9 +579,11 @@ extern int assert_enabled;
  *
  */
 #define LogTrap(condition, exception, printArgs) \
-               { if ((assert_enabled) && (condition)) \
+               do { \
+                       if ((assert_enabled) && (condition)) \
                                ExceptionalCondition(CppAsString(condition), &(exception), \
-                                               vararg_format printArgs, __FILE__, __LINE__); }
+                                               vararg_format printArgs, __FILE__, __LINE__); \
+               } while (0)
 
 /*
  *     LogTrapMacro is the same as LogTrap but it's intended for use in macros:

diff --git a/src/test/regress/checkresults b/src/test/regress/checkresults
index 39783cf46822cfbef5f40cdbf4012ee930e0f5b4..3e8a033660ddd6709b8f0658e36dfa4c74a23601 100755 (executable)
--- a/src/test/regress/checkresults
+++ b/src/test/regress/checkresults
@@ -4,7 +4,7 @@
 
 [ "$#" -eq 0 ] && set regress.out
 
-for file in `cat "$@" | grep 'failed$' | cut -d " " -f 1`
+for file in `cat "$@" | grep 'failed$' | grep -v '^dropdb: ' | cut -d " " -f 1`
 do
        echo "======   $file   ======"
        diff -w expected/$file.out results