From: Brian Norris <banorris@uci.edu>
Date: Tue, 20 Nov 2012 00:37:26 +0000 (-0800)
Subject: output: don't redirect any output for DEBUG builds
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=222118f318e4788839083a6d99aa7309246243e7;hp=5f861ebe39567a3bf01635bb7343ed8a8e26803f

output: don't redirect any output for DEBUG builds
---

diff --git a/common.cc b/common.cc
index f8df1335..c190ed37 100644
--- a/common.cc
+++ b/common.cc
@@ -14,8 +14,8 @@
 
 #define MAX_TRACE_LEN 100
 
-FILE *model_out;
-int fd_user_out; /**< @brief File descriptor from which to read user program output */
+/** @brief Model-checker output stream; default to stdout until redirected */
+FILE *model_out = stdout;
 
 #define CONFIG_STACKTRACE
 /** Print a backtrace of the current program state. */
@@ -60,6 +60,10 @@ void model_assert(bool expr, const char *file, int line)
 	}
 }
 
+#ifndef CONFIG_DEBUG
+
+static int fd_user_out; /**< @brief File descriptor from which to read user program output */
+
 /**
  * @brief Setup output redirecting
  *
@@ -161,3 +165,4 @@ void print_program_output()
 		}
 	}
 }
+#endif /* ! CONFIG_DEBUG */
diff --git a/output.h b/output.h
index ca55b7a6..e390bb61 100644
--- a/output.h
+++ b/output.h
@@ -5,8 +5,16 @@
 #ifndef __OUTPUT_H__
 #define __OUTPUT_H__
 
+#include "config.h"
+
+#ifdef CONFIG_DEBUG
+static inline void redirect_output() { }
+static inline void clear_program_output() { }
+static inline void print_program_output() { }
+#else
 void redirect_output();
 void clear_program_output();
 void print_program_output();
+#endif /* ! CONFIG_DEBUG */
 
 #endif /* __OUTPUT_H__ */