<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch travis-ci
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/84b1854a60951d215ca1ca2355aebe8421169342">https://github.com/macports/macports-base/commit/84b1854a60951d215ca1ca2355aebe8421169342</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 84b1854a60951d215ca1ca2355aebe8421169342
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Wed Dec 9 00:09:50 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> machista1.0: Use libstdc++ for tests
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libSystem.B.dylib does not exist on Big Sur anymore. Luckily it seems
</span><span style='display:block; white-space:pre;color:#404040;'> libstdc++.dylib is still around, so let's use that for now.
</span>---
src/machista1.0/tests/libmachista-test.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/machista1.0/tests/libmachista-test.c b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 527e415c..3aead4eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/machista1.0/tests/libmachista-test.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> #include <sys/wait.h>
#include <unistd.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#define LIBSYSTEM_PATH "/usr/lib/libSystem.B.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define TEST_LIB_PATH "/usr/lib/libstdc++.6.dylib"
</span> #define OTOOL_PATH "/usr/bin/otool"
// check helper
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -276,7 +276,7 @@ static bool test_destroy_null(void) {
</span> }
/**
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * Test reading libSystem.B.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Test reading TEST_LIB_PATH
</span> */
static void forked_test_libsystem(void) {
macho_handle_t *handle = macho_create_handle();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,20 +284,20 @@ static void forked_test_libsystem(void) {
</span> int ret = 0;
// parse file
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((ret = macho_parse_file(handle, LIBSYSTEM_PATH, &result)) != MACHO_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("\tError parsing `%s': %s\n", LIBSYSTEM_PATH, macho_strerror(ret));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((ret = macho_parse_file(handle, TEST_LIB_PATH, &result)) != MACHO_SUCCESS) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("\tError parsing `%s': %s\n", TEST_LIB_PATH, macho_strerror(ret));
</span> }
// get otool reference output
<span style='display:block; white-space:pre;background:#ffe0e0;'>- bool success = compare_to_otool_output(LIBSYSTEM_PATH, result);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool success = compare_to_otool_output(TEST_LIB_PATH, result);
</span>
macho_destroy_handle(handle);
exit(!success);
}
static bool test_libsystem(void) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts("Testing parsing libSystem.B.dylib");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fork_test(forked_test_libsystem, "Error parsing libSystem.B.dylib")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts("Testing parsing " TEST_LIB_PATH);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fork_test(forked_test_libsystem, "Error parsing " TEST_LIB_PATH)) {
</span> puts("\tOK");
return true;
}
</pre><pre style='margin:0'>
</pre>