Binary file src/test/ns3tcp/ns3tcp-interop-response-vectors.pcap has changed
--- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc Mon Sep 28 20:18:49 2009 -0700
+++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc Mon Sep 28 21:57:59 2009 -0700
@@ -36,7 +36,7 @@
NS_LOG_COMPONENT_DEFINE ("Ns3TcpInteropTest");
-const bool WRITE_VECTORS = false; // hack hack hack
+const bool WRITE_VECTORS = false; // set to true to write response vectors
const uint32_t PCAP_LINK_TYPE = 1187373553; // Some large random number -- we use to verify data was written by this program
const uint32_t PCAP_SNAPLEN = 64; // Don't bother to save much data
--- a/test.py Mon Sep 28 20:18:49 2009 -0700
+++ b/test.py Mon Sep 28 21:57:59 2009 -0700
@@ -654,6 +654,7 @@
# Dispatching will run with unlimited speed and the worker threads will
# execute as fast as possible from the queue.
#
+ total_tests = 0
for test in suite_list:
if len(test):
job = Job()
@@ -669,6 +670,7 @@
input_queue.put(job)
jobs = jobs + 1
+ total_tests = total_tests + 1
#
# We've taken care of the discovered or specified test suites. Now we
@@ -728,6 +730,8 @@
input_queue.put(job)
jobs = jobs + 1
+ total_tests = total_tests + 1
+
elif len(options.example):
#
# If you tell me to run an example, I will try and run the example
@@ -746,6 +750,7 @@
input_queue.put(job)
jobs = jobs + 1
+ total_tests = total_tests + 1
#
# Tell the worker threads to pack up and go home for the day. Each one
@@ -766,6 +771,9 @@
# ignore them. If there are real results, we always print PASS or FAIL to
# standard out as a quick indication of what happened.
#
+ passed_tests = 0
+ failed_tests = 0
+ crashed_tests = 0
for i in range(jobs):
job = output_queue.get()
if job.is_break:
@@ -778,8 +786,13 @@
if job.returncode == 0:
status = "PASS"
+ passed_tests = passed_tests + 1
+ elif job.returncode == 1:
+ failed_tests = failed_tests + 1
+ status = "FAIL"
else:
- status = "FAIL"
+ crashed_tests = crashed_tests + 1
+ status = "CRASH"
print "%s: %s %s" % (status, kind, job.display_name)
@@ -861,6 +874,11 @@
f.close()
#
+ # Print a quick summary of events
+ #
+ print "%d of %d tests passed (%d passed, %d failed, %d crashed)" % (passed_tests, total_tests, passed_tests,
+ failed_tests, crashed_tests)
+ #
# The last things to do are to translate the XML results file to "human
# readable form" if the user asked for it (or make an XML file somewhere)
#