[gjs] build: Remove underscore from symbols used in tests



commit 8c578621f7b4c21836f6a21634ecdbb57451abab
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Dec 27 18:17:31 2016 -0700

    build: Remove underscore from symbols used in tests
    
    The underscore prevents them from being exported, and they need to be
    exported in order to be used in the tests.
    
    (Unreviewed, fixes build on macOS)

 gjs/coverage-internal.h    |   16 ++++++++--------
 gjs/coverage.cpp           |   16 ++++++++--------
 test/gjs-test-coverage.cpp |   30 +++++++++++++++---------------
 3 files changed, 31 insertions(+), 31 deletions(-)
---
diff --git a/gjs/coverage-internal.h b/gjs/coverage-internal.h
index a720ad4..5f2b8a3 100644
--- a/gjs/coverage-internal.h
+++ b/gjs/coverage-internal.h
@@ -28,14 +28,14 @@
 
 G_BEGIN_DECLS
 
-GjsCoverage *_gjs_coverage_new_internal_with_cache(const char * const *coverage_prefixes,
-                                                   GjsContext         *context,
-                                                   GFile              *output_dir,
-                                                   GFile              *cache_path);
-
-GjsCoverage *_gjs_coverage_new_internal_without_cache(const char * const *prefixes,
-                                                      GjsContext         *cx,
-                                                      GFile              *output_dir);
+GjsCoverage *gjs_coverage_new_internal_with_cache(const char * const *coverage_prefixes,
+                                                  GjsContext         *context,
+                                                  GFile              *output_dir,
+                                                  GFile              *cache_path);
+
+GjsCoverage *gjs_coverage_new_internal_without_cache(const char * const *prefixes,
+                                                     GjsContext         *cx,
+                                                     GFile              *output_dir);
 
 GBytes * gjs_serialize_statistics(GjsCoverage *coverage);
 
diff --git a/gjs/coverage.cpp b/gjs/coverage.cpp
index 002c79f..2355b08 100644
--- a/gjs/coverage.cpp
+++ b/gjs/coverage.cpp
@@ -1878,10 +1878,10 @@ gjs_coverage_new (const char * const *prefixes,
 }
 
 GjsCoverage *
-_gjs_coverage_new_internal_with_cache(const char * const *coverage_prefixes,
-                                      GjsContext         *context,
-                                      GFile              *output_dir,
-                                      GFile              *cache)
+gjs_coverage_new_internal_with_cache(const char * const *coverage_prefixes,
+                                     GjsContext         *context,
+                                     GFile              *output_dir,
+                                     GFile              *cache)
 {
     GjsCoverage *coverage =
         GJS_COVERAGE(g_object_new(GJS_TYPE_COVERAGE,
@@ -1895,9 +1895,9 @@ _gjs_coverage_new_internal_with_cache(const char * const *coverage_prefixes,
 }
 
 GjsCoverage *
-_gjs_coverage_new_internal_without_cache(const char * const *prefixes,
-                                         GjsContext         *cx,
-                                         GFile              *output_dir)
+gjs_coverage_new_internal_without_cache(const char * const *prefixes,
+                                        GjsContext         *cx,
+                                        GFile              *output_dir)
 {
-    return _gjs_coverage_new_internal_with_cache(prefixes, cx, output_dir, NULL);
+    return gjs_coverage_new_internal_with_cache(prefixes, cx, output_dir, NULL);
 }
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index fb27d93..9d02417 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -119,8 +119,8 @@ gjs_coverage_fixture_set_up(gpointer      fixture_data,
 
     fixture->context = gjs_context_new_with_search_path((char **) search_paths);
     fixture->coverage =
-        _gjs_coverage_new_internal_without_cache(coverage_paths, fixture->context,
-                                                 fixture->lcov_output_dir);
+        gjs_coverage_new_internal_without_cache(coverage_paths, fixture->context,
+                                                fixture->lcov_output_dir);
 
     replace_file(fixture->tmp_js_script, js_script);
     g_free(tmp_output_dir_name);
@@ -311,8 +311,8 @@ create_coverage_for_script(GjsContext *context,
     };
 
     GjsCoverage *retval =
-        _gjs_coverage_new_internal_without_cache(coverage_scripts, context,
-                                                 output_dir);
+        gjs_coverage_new_internal_without_cache(coverage_scripts, context,
+                                                output_dir);
     g_free(script_path);
     return retval;
 }
@@ -330,8 +330,8 @@ create_coverage_for_script_and_cache(GjsContext *context,
     };
 
     GjsCoverage *retval =
-        _gjs_coverage_new_internal_with_cache(coverage_scripts, context,
-                                              output_dir, cache);
+        gjs_coverage_new_internal_with_cache(coverage_scripts, context,
+                                             output_dir, cache);
     g_free(script_path);
     return retval;
 }
@@ -358,9 +358,9 @@ test_covered_file_is_duplicated_into_output_if_resource(gpointer      fixture_da
 
     fixture->context = gjs_context_new_with_search_path(search_paths);
     fixture->coverage =
-        _gjs_coverage_new_internal_without_cache(coverage_scripts,
-                                                 fixture->context,
-                                                 fixture->lcov_output_dir);
+        gjs_coverage_new_internal_without_cache(coverage_scripts,
+                                                fixture->context,
+                                                fixture->lcov_output_dir);
 
     gjs_context_eval_file(fixture->context,
                           mock_resource_filename,
@@ -504,9 +504,9 @@ test_expected_entry_not_written_for_nonexistent_file(gpointer      fixture_data,
 
     g_object_unref(fixture->coverage);
     fixture->coverage =
-        _gjs_coverage_new_internal_without_cache(coverage_paths,
-                                                 fixture->context,
-                                                 fixture->lcov_output_dir);
+        gjs_coverage_new_internal_without_cache(coverage_paths,
+                                                fixture->context,
+                                                fixture->lcov_output_dir);
 
     /* Temporarily disable fatal mask and silence warnings */
     GLogLevelFlags old_flags = g_log_set_always_fatal((GLogLevelFlags) G_LOG_LEVEL_ERROR);
@@ -1271,9 +1271,9 @@ gjs_coverage_multiple_source_files_to_single_output_fixture_set_up(gpointer fixt
 
     fixture->base_fixture.context = gjs_context_new_with_search_path(search_paths);
     fixture->base_fixture.coverage =
-        _gjs_coverage_new_internal_without_cache(coverage_paths,
-                                                 fixture->base_fixture.context,
-                                                 fixture->base_fixture.lcov_output_dir);
+        gjs_coverage_new_internal_without_cache(coverage_paths,
+                                                fixture->base_fixture.context,
+                                                fixture->base_fixture.lcov_output_dir);
 
     g_free(output_path);
     g_free(first_js_script_path);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]