summaryrefslogtreecommitdiff
path: root/bin
diff options
authorRod Smith <rod.smith@canonical.com>2016-04-13 23:31:33 +0000
committerSylvain Pineau <>2016-04-13 23:31:33 +0000
commite6c028fc5cd042a0ab60ffd3b6c6751d2d3ccb4f (patch)
tree8291f2c8a391c80e566747d3a34e0009d4b6d690 /bin
parent448ee1a1f0040a25b0035f34722f027acd55c5b4 (diff)
parent1298a26bde63ac5eaf9b730ea22a6551aee26af9 (diff)
"automatic merge of lp:~rodsmith/checkbox/fix-memory-test-miss/ by tarmac [r=bladernr][bug=1569961][author=rodsmith]"
Diffstat (limited to 'bin')
-rwxr-xr-xbin/memory_stress_ng1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/memory_stress_ng b/bin/memory_stress_ng
index e33cccf4..aab59457 100755
--- a/bin/memory_stress_ng
+++ b/bin/memory_stress_ng
@@ -88,6 +88,7 @@ run_stressor() {
fi
echo "*****************************************************************"
had_error=1
+ result=$return_code
fi
} # run_stressor()