[gjs: 20/25] tests: Minor changes in debugger and coverage expected output

[Philip Chimento <pchimento src gnome org>]

commit b814915a2c4e2c15e11bce4f18b3605fabe5915c
Author: Philip Chimento <philip chimento gmail com>
Date:   Fri Jun 7 13:11:23 2019 -0700

    tests: Minor changes in debugger and coverage expected output
    
    This is due to small bugfixes and/or changes in SpiderMonkey's debugger
    output.
    
    Note that the coverage changes are equally valid and our tests would
    actually ideally be robust to changes like this.

 installed-tests/debugger/backtrace.debugger.output |  2 +-
 test/gjs-test-coverage.cpp                         | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/installed-tests/debugger/backtrace.debugger.output 
b/installed-tests/debugger/backtrace.debugger.output
index 7f8e0fe3..021be8a9 100644
--- a/installed-tests/debugger/backtrace.debugger.output
+++ b/installed-tests/debugger/backtrace.debugger.output
@@ -9,6 +9,6 @@ db> c
 Debugger statement, <anonymous>([object Array], 0, [object Array]) at backtrace.debugger.js:3:4
 db> where
 #0    <anonymous>([object Array], 0, [object Array]) at backtrace.debugger.js:3:4
-#1    toplevel at backtrace.debugger.js:2:0
+#1    toplevel at backtrace.debugger.js:2:36
 db> q
 Program exited with code 0
diff --git a/test/gjs-test-coverage.cpp b/test/gjs-test-coverage.cpp
index 2a77f977..b775156d 100644
--- a/test/gjs-test-coverage.cpp
+++ b/test/gjs-test-coverage.cpp
@@ -710,10 +710,10 @@ static void test_function_names_written_to_coverage_data(void* fixture_data,
                                           fixture->tmp_js_script,
                                           fixture->lcov_output);
 
-    const char * expected_function_names[] = {
-        "top-level",
-        "f",
+    const char* expected_function_names[] = {
         "b",
+        "f",
+        "top-level",
     };
     const gsize expected_function_names_len = G_N_ELEMENTS(expected_function_names);
 
@@ -758,10 +758,10 @@ static void test_function_lines_written_to_coverage_data(void* fixture_data,
                                           fixture->coverage,
                                           fixture->tmp_js_script,
                                           fixture->lcov_output);
-    const char * const expected_function_lines[] = {
+    const char* const expected_function_lines[] = {
+        "3",
         "1",
         "1",
-        "3"
     };
     const gsize expected_function_lines_len = G_N_ELEMENTS(expected_function_lines);
 
@@ -844,9 +844,9 @@ static void test_function_hit_counts_for_big_functions_written_to_coverage_data(
                                           fixture->lcov_output);
 
     const FunctionHitCountData expected_hit_counts[] = {
-        { "top-level", 1 },
-        { "f", 1 },
-        { "b", 1 },
+        {"b", 1},
+        {"f", 1},
+        {"top-level", 1},
     };
 
     const gsize expected_hit_count_len = G_N_ELEMENTS(expected_hit_counts);
@@ -889,9 +889,9 @@ test_function_hit_counts_for_little_functions_written_to_coverage_data(
                                           fixture->lcov_output);
 
     const FunctionHitCountData expected_hit_counts[] = {
-        { "top-level", 1 },
-        { "f", 1 },
-        { "b", 1 },
+        {"b", 1},
+        {"f", 1},
+        {"top-level", 1},
     };
 
     const gsize expected_hit_count_len = G_N_ELEMENTS(expected_hit_counts);
@@ -929,9 +929,9 @@ static void test_function_hit_counts_written_to_coverage_data(
                                           fixture->lcov_output);
 
     const FunctionHitCountData expected_hit_counts[] = {
-        { "top-level", 1 },
-        { "f", 1 },
-        { "b", 1 },
+        {"b", 1},
+        {"f", 1},
+        {"top-level", 1},
     };
 
     const gsize expected_hit_count_len = G_N_ELEMENTS(expected_hit_counts);