Some small changes to the testsdevelop

1 files changed, 14 insertions, 5 deletions

diff --git a/test/execute_test.cc b/test/execute_test.cc
index 11b067f..f8f902f 100644
--- a/test/execute_test.cc
+++ b/test/execute_test.cc
@@ -23,6 +23,8 @@ public:
 
 	void return_value()
 	{
+		constexpr int segfault_return_value = 11;
+		constexpr int exception_return_value = 6;
 		ctor::settings s;
 		auto cur_path = std::filesystem::path(paths::argv_0).parent_path();
 		std::vector<std::string> paths{{cur_path.string()}};
@@ -31,16 +33,21 @@ public:
 
 		auto value = execute(s, cmd, {"retval", "0"}, {}, false);
 		uASSERT_EQUAL(0, value);
+
 		value = execute(s, cmd, {"retval", "1"}, {}, false);
 		uASSERT_EQUAL(1, value);
+
 		value = execute(s, "no-such-binary", {}, {}, false);
 		uASSERT_EQUAL(1, value);
+
 		value = execute(s, cmd, {"segfault"}, {}, false);
-		uASSERT_EQUAL(11, value);
+		uASSERT_EQUAL(segfault_return_value, value);
+
 		value = execute(s, cmd, {"throw"}, {}, false);
-		uASSERT_EQUAL(6, value);
+		uASSERT_EQUAL(exception_return_value, value);
+
 		value = execute(s, cmd, {"abort"}, {}, false);
-		uASSERT_EQUAL(6, value);
+		uASSERT_EQUAL(exception_return_value, value);
 	}
 
 	void env()
@@ -83,11 +90,13 @@ public:
 		chk = std::find(vars.begin(), vars.end(), "bar=42"s);
 		uASSERT(chk != vars.end());
 
-		// Check the one that should have overwritten the existing one (probably LANG=en_US.UTF-8 or something)
+		// Check the one that should have overwritten the existing one (probably
+		// LANG=en_US.UTF-8 or something)
 		chk = std::find(vars.begin(), vars.end(), "LANG=foo"s);
 		uASSERT(chk != vars.end());
 
-		// Check that other vars are also there (ie. the env wasn't cleared on entry)
+		// Check that other vars are also there (ie. the env wasn't cleared on
+		// entry)
 		uASSERT(vars.size() > 3);
 	}
 };