From 8758985c3a20741651555b1bb4b5866f4a3d47d1 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 12 Apr 2000 05:24:51 +0000
Subject: [PATCH] Prevent drop database failure from showing.
---
src/include/c.h | 14 +++++++++-----
src/test/regress/checkresults | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/include/c.h b/src/include/c.h
index ea96d87b911..af895f8bac3 100644
--- 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 39783cf4682..3e8a033660d 100755
--- 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
--
GitLab