Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/test_RealTime.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import sst
import sys

# Note: test WILL NOT terminate on its own
# PR #1536 All tests not exiting on their own should use --exit-after
if len(sys.argv) == 2 and sys.argv[1] == "stop":
sst.setProgramOption("stop-at", "25us")
print("WARNING[test_RealTime.py:6] ignoring 'stop' argument");
# sst.setProgramOption("stop-at", "25us")

# Define the simulation components
comp_map = []
Expand Down
8 changes: 4 additions & 4 deletions tests/testsuite_default_RealTime.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def test_RealTime_heartbeat(self):
# Run test
sdlfile = "{0}/test_RealTime.py".format(testsuitedir)
outfile = "{0}/test_RealTime_heartbeat.out".format(outdir)
self.run_sst(sdlfile, outfile, other_args="--exit-after=6s --heartbeat-wall-period=1")
self.run_sst(sdlfile, outfile, other_args="--exit-after=15s --heartbeat-wall-period=1")

# Cannot diff test output because times may differ
# Check for at least 5 heartbeat messages
Expand All @@ -193,7 +193,7 @@ def test_RealTime_heartbeat(self):
num_lines = 126 + 2*num_para # basic heartbeat (>25) + exit messages (1 + 2*para) + Component Finished messages (100)
if ranks > 1:
num_lines += 10 # Extra heartbeat output for MPI
self.assertTrue(hb_count >= 5, "Heartbeat count incorrect, should be at least 5, found {0} in {1}".format(hb_count,outfile))
self.assertTrue(hb_count >= 3, "Heartbeat count incorrect, should be at least 3, found {0} in {1}".format(hb_count,outfile))
self.assertTrue(exit_count == num_para, "Exit message count incorrect, should be {0}, found {1} in {2}".format(num_para,exit_count,outfile))
self.assertTrue(line_count >= num_lines, "Line count incorrect, should be {0}, found {1} in {2}".format(num_lines,line_count,outfile))

Expand Down Expand Up @@ -282,7 +282,7 @@ def test_RealTime_SIGALRM_multiaction(self):
# Run test
sdlfile = "{0}/test_RealTime.py".format(testsuitedir)
outfile = "{0}/test_RealTime_SIGALRM_multiaction.out".format(outdir)
self.run_sst(sdlfile, outfile, other_args="--exit-after=6s --sigalrm=sst.rt.heartbeat(interval=1s);sst.rt.status.core(interval=2s)")
self.run_sst(sdlfile, outfile, other_args="--exit-after=15s --sigalrm=sst.rt.heartbeat(interval=1s);sst.rt.status.core(interval=2s)")

# Check for a heartbeat message: 5-6
# Check for status: 2-3
Expand All @@ -307,7 +307,7 @@ def test_RealTime_SIGALRM_multiaction(self):
num_lines = 126 + 4*num_para # basic heartbeat (>25) + exit messages (1 + 2*para) + status (> 2*para) + Component Finished messages (100)
if ranks > 1:
num_lines += 10 # Extra heartbeat output for MPI (2 per HB)
self.assertTrue(hb_count >= 5, "Heartbeat count incorrect, should be at least 5, found {0} in {1}".format(hb_count,outfile))
self.assertTrue(hb_count >= 3, "Heartbeat count incorrect, should be at least 3, found {0} in {1}".format(hb_count,outfile))
self.assertTrue(status_count >= 2, "Output file is missing core status output messages")
self.assertTrue(exit_count == num_para, "Exit message count incorrect, should be {0}, found {1} in {2}".format(num_para,exit_count,outfile))
self.assertTrue(line_count >= num_lines, "Line count incorrect, should be {0}, found {1} in {2}".format(num_lines,line_count,outfile))
Loading