From e1e07f2ffd44887874eaecf23160c8793666bfb6 Mon Sep 17 00:00:00 2001
From: Tommaso Pecorella <tommaso.pecorella@unifi.it>
Date: Wed, 26 Jan 2022 11:09:13 -0300
Subject: [PATCH] core: skip results checking when introspecting the command
 line

---
 src/core/model/example-as-test.cc | 10 +++++++++-
 test.py                           |  5 +----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/core/model/example-as-test.cc b/src/core/model/example-as-test.cc
index 6e42ed539..b2022be0d 100644
--- a/src/core/model/example-as-test.cc
+++ b/src/core/model/example-as-test.cc
@@ -25,7 +25,8 @@
 
 #include <string>
 #include <sstream>
-#include <cstdlib>  // itoa(), system ()
+#include <cstdlib>  // itoa(), system (), getenv ()
+#include <cstring>
 
 /**
  * \file
@@ -122,6 +123,13 @@ ExampleAsTestCase::DoRun (void)
   // Make sure the example didn't outright crash
   NS_TEST_ASSERT_MSG_EQ (status, 0, "example " + m_program + " failed");
 
+  // Check that we're not just introspecting the command-line
+  const char * envVar = std::getenv ("NS_COMMANDLINE_INTROSPECTION");
+  if (envVar != 0 && std::strlen (envVar) != 0)
+    {
+      return;
+    }
+
   // Compare the testFile to the reference file
   NS_ASCII_TEST_EXPECT_EQ (testFile, refFile);
 }
diff --git a/test.py b/test.py
index d57bbedd5..c32be7615 100755
--- a/test.py
+++ b/test.py
@@ -1998,7 +1998,4 @@ def main(argv):
     return run_tests()
 
 if __name__ == '__main__':
-    returncode = main(sys.argv)
-    if os.getenv("NS_COMMANDLINE_INTROSPECTION", None) is not None:
-        returncode = 0
-    sys.exit(returncode)
+    sys.exit(main(sys.argv))