4 files changed, 21 insertions, 15 deletions
diff --git a/systemtest/config/unix.exp b/systemtest/config/unix.exp
index e69de29..2de93b0 100644
--- a/systemtest/config/unix.exp
+++ b/systemtest/config/unix.exp
@@ -0,0 +1,19 @@
+proc runtest_exit_code { test_name command_line exit_code } {
+
+  spawn $command_line
+  
+  expect eof
+  
+  lassign [wait] pid spawnid os_error_flag value
+  
+  if {$os_error_flag == 0} {
+    if {$value == $exit_code} {
+      pass "$test_name: Returned expected value $value"
+    } else {
+      fail "$test_name: Returned bad value $value, expected: $exit_code"
+    }
+  } else {
+    fail "$test_name: errno: $value"
+  }
+
+}
diff --git a/systemtest/mcc-execute.tests/exitcodes.exp b/systemtest/mcc-execute.tests/exitcodes.exp
index 6e8b632..48d19a1 100644
--- a/systemtest/mcc-execute.tests/exitcodes.exp
+++ b/systemtest/mcc-execute.tests/exitcodes.exp
@@ -1,18 +1,5 @@
 # https://www.embecosm.com/appnotes/ean8/ean8-howto-dejagnu-1.0.html
 
-spawn systemtest/mcc-execute.tests/test1
-
-expect eof
-
-lassign [wait] pid spawnid os_error_flag value
-
-if {$os_error_flag == 0} {
-  if {$value == 3} {
-    pass "exit status: $value"
-  } else {
-    fail "exit status: $value"
-  }
-} else {
-  fail "errno: $value"
-}
+runtest_exit_code "Return 1" "systemtest/mcc-execute.tests/test-return-1" 1
+runtest_exit_code "Addition" "systemtest/mcc-execute.tests/test-addition" 3
 
diff --git a/systemtest/mcc-execute.tests/test1.cpp b/systemtest/mcc-execute.tests/test-addition.cpp
index 3a03f6f..3a03f6f 100644
--- a/systemtest/mcc-execute.tests/test1.cpp
+++ b/systemtest/mcc-execute.tests/test-addition.cpp
diff --git a/systemtest/mcc-execute.tests/test.cpp b/systemtest/mcc-execute.tests/test-return-1.cpp
index 40cbb54..40cbb54 100644
--- a/systemtest/mcc-execute.tests/test.cpp
+++ b/systemtest/mcc-execute.tests/test-return-1.cpp