Merge pull request #305 from maxmind/greg/require-linux-for-test

Require Linux for external symbols test

Author: shadromani

Changes.md

@@ -1,3 +1,8 @@
+## 1.7.1
+
+* The external symbols test now only runs on Linux. It assumes a Linux
+  environment. Reported by Carlo Cabrera. GitHub #304.
+
 ## 1.7.0 - 2022-09-28
 
 * `FD_CLOEXEC` is now set on platforms that do not support `O_CLOEXEC`.

t/data_entry_list_t.c

@@ -203,8 +203,7 @@ test_map_value(MMDB_entry_data_list_s *entry_data_list) {
            "==",
            MMDB_DATA_TYPE_UTF8_STRING,
            "found a map key in 'map'");
-    char *map_key_1_name =
-        dup_entry_string_or_bail(map_key_1->entry_data);
+    char *map_key_1_name = dup_entry_string_or_bail(map_key_1->entry_data);
     ok(strcmp(map_key_1_name, "mapX") == 0, "key name is mapX");
     free(map_key_1_name);
 
@@ -323,15 +322,15 @@ test_utf8_string_value(MMDB_entry_data_list_s *entry_data_list) {
                        0x65,
                        0x21,
                        0x20,
-                       (char) 0xe2,
-                       (char) 0x98,
-                       (char) 0xaf,
+                       (char)0xe2,
+                       (char)0x98,
+                       (char)0xaf,
                        0x20,
                        0x2d,
                        0x20,
-                       (char) 0xe2,
-                       (char) 0x99,
-                       (char) 0xab,
+                       (char)0xe2,
+                       (char)0x99,
+                       (char)0xab,
                        0x00};
 
     is(utf8_string, expect, "got expected value for utf8_string key");

t/data_types_t.c

@@ -25,15 +25,15 @@ void test_all_data_types(MMDB_lookup_result_s *result,
                            0x65,
                            0x21,
                            0x20,
-                           (char) 0xe2,
-                           (char) 0x98,
-                           (char) 0xaf,
+                           (char)0xe2,
+                           (char)0x98,
+                           (char)0xaf,
                            0x20,
                            0x2d,
                            0x20,
-                           (char) 0xe2,
-                           (char) 0x99,
-                           (char) 0xab,
+                           (char)0xe2,
+                           (char)0x99,
+                           (char)0xab,
                            0x00};
         is(string, expect, "got expected utf8_string value");
 

t/external_symbols_t.pl

@@ -5,12 +5,20 @@
 
 use FindBin qw( $Bin );
 
+_skip_tests_if_not_linux();
 _skip_tests_if_required_modules_are_not_present();
 _skip_tests_if_nm_is_not_present();
 _test_libs_external_symbols();
 
 done_testing();
 
+sub _skip_tests_if_not_linux {
+    return if $^O eq 'linux';
+
+    print "1..0 # skip all tests skipped - this test requires Linux.\n";
+    exit 0;
+}
+
 sub _skip_tests_if_required_modules_are_not_present {
     eval <<'EOF';
     use Test::More 0.88;

t/maxminddb_test_helper.c

@@ -67,8 +67,7 @@ char *test_database_path(const char *filename) {
 }
 
 char *dup_entry_string_or_bail(MMDB_entry_data_s entry_data) {
-    char *string =
-        mmdb_strndup(entry_data.utf8_string, entry_data.data_size);
+    char *string = mmdb_strndup(entry_data.utf8_string, entry_data.data_size);
     if (NULL == string) {
         BAIL_OUT("mmdb_strndup failed");
     }

t/threads_t.c

@@ -130,7 +130,8 @@ void run_ipX_tests(MMDB_s *mmdb,
                    int pairs_rows,
                    const char *mode_desc) {
     pthread_t *threads = malloc((unsigned long)pairs_rows * sizeof(pthread_t));
-    struct thread_arg *thread_args = malloc((unsigned long)pairs_rows * sizeof(struct thread_arg));
+    struct thread_arg *thread_args =
+        malloc((unsigned long)pairs_rows * sizeof(struct thread_arg));
 
     for (int i = 0; i < pairs_rows; i += 1) {
         thread_args[i].thread_id = i;