From dc9c9f08f42c4046fe73e92ff145e6ba138ada4c Mon Sep 17 00:00:00 2001
From: Mitch Watrous <watrous@u.washington.edu>
Date: Fri, 14 Jun 2013 16:31:10 -0700
Subject: [PATCH] Bug 1695 - improve test.py output when -g selected without
 valgrind

---
 test.py | 12 ++++++++++++
 wscript |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/test.py b/test.py
index e0b2fc6d3..d1284598c 100755
--- a/test.py
+++ b/test.py
@@ -58,6 +58,7 @@ interesting_config_items = [
     "BUILD_PROFILE",
     "VERSION",
     "PYTHON",
+    "VALGRIND_FOUND",
 ]
 
 NSC_ENABLED = False
@@ -73,6 +74,7 @@ APPNAME = ""
 BUILD_PROFILE = ""
 VERSION = ""
 PYTHON = ""
+VALGRIND_FOUND = True
 
 #
 # This will be given a prefix and a suffix when the waf config file is
@@ -1765,6 +1767,16 @@ def run_tests():
             print '***  "--enable-examples" to ./waf configure or modifying your .ns3rc file.'
             print
 
+    #
+    # Let the user know if they tried to use valgrind but it was not
+    # present on their machine.
+    #
+    if options.valgrind and not VALGRIND_FOUND:
+        print
+        print '***  Note: you are trying to use valgrind, but valgrind could not be found'
+        print '***  on your machine.  All tests and examples will crash or be skipped.'
+        print
+
     #
     # If we have been asked to retain all of the little temporary files, we
     # don't delete tm.  If we do delete the temporary files, delete only the
diff --git a/wscript b/wscript
index 43fadc4e4..2052950dc 100644
--- a/wscript
+++ b/wscript
@@ -468,8 +468,10 @@ def configure(conf):
     conf.report_optional_feature("ENABLE_EXAMPLES", "Build examples", env['ENABLE_EXAMPLES'], 
                                  why_not_examples)
 
+    env['VALGRIND_FOUND'] = False
     try:
         conf.find_program('valgrind', var='VALGRIND')
+        env['VALGRIND_FOUND'] = True
     except WafError:
         pass