From: Brian Norris <banorris@uci.edu>
Date: Mon, 4 Mar 2013 05:08:38 +0000 (-0800)
Subject: refactor DBG_ENABLED() vs. verbose
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=491b379adcbd0897c6f9ab5660d4d23afde3abb9

refactor DBG_ENABLED() vs. verbose

Always set 'verbose' when we are compiling a DEBUG build.
---

diff --git a/main.cc b/main.cc
index dc3f6f4d..b6e41523 100644
--- a/main.cc
+++ b/main.cc
@@ -22,7 +22,7 @@ static void param_defaults(struct model_params *params)
 	params->bound = 0;
 	params->maxfuturevalues = 0;
 	params->expireslop = 10;
-	params->verbose = 0;
+	params->verbose = !!DBG_ENABLED();
 }
 
 static void print_usage(struct model_params *params)
diff --git a/model.cc b/model.cc
index 62550da7..0a5cda59 100644
--- a/model.cc
+++ b/model.cc
@@ -530,7 +530,7 @@ void ModelChecker::print_execution(bool printbugs) const
 {
 	print_program_output();
 
-	if (DBG_ENABLED() || params.verbose) {
+	if (params.verbose) {
 		model_print("Earliest divergence point since last feasible execution:\n");
 		if (earliest_diverge)
 			earliest_diverge->print();
@@ -574,7 +574,7 @@ bool ModelChecker::next_execution()
 	record_stats();
 
 	/* Output */
-	if (DBG_ENABLED() || params.verbose || (complete && have_bug_reports()))
+	if (params.verbose || (complete && have_bug_reports()))
 		print_execution(complete);
 	else
 		clear_program_output();