diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2019-05-31 23:42:38 -0700 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2019-06-08 23:01:56 -0700 |
| commit | 1f96eb4bd25451bf556b1f77a942209a3f981bb3 (patch) | |
| tree | 934ce47c3f824de06a4e53171a1e35166da1bfd0 /test/gjs-tests.cpp | |
| parent | a759d514260a1c65f10c64af9bdef85acf49a2fa (diff) | |
| download | gjs-1f96eb4bd25451bf556b1f77a942209a3f981bb3.tar.gz | |
util: Remove util/glib
This file only had one function in it. It's not clear why this util file
is "glib" and the other file with one function in it is "misc". Merge
them both into "misc".
Diffstat (limited to 'test/gjs-tests.cpp')
| -rw-r--r-- | test/gjs-tests.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/gjs-tests.cpp b/test/gjs-tests.cpp index 4ab3f8d6..522847a0 100644 --- a/test/gjs-tests.cpp +++ b/test/gjs-tests.cpp @@ -27,13 +27,13 @@ #include <glib.h> #include <glib-object.h> -#include <util/glib.h> #include <gjs/gjs.h> #include "gjs/jsapi-util.h" #include "gjs/jsapi-wrapper.h" #include "gjs-test-utils.h" #include "util/error.h" +#include "util/misc.h" #define VALID_UTF8_STRING "\303\211\303\226 foobar \343\203\237" @@ -286,7 +286,7 @@ static void test_jsapi_util_debug_string_object_with_complicated_to_string( } static void -gjstest_test_func_util_glib_strv_concat_null(void) +gjstest_test_func_util_misc_strv_concat_null(void) { char **ret; @@ -298,7 +298,7 @@ gjstest_test_func_util_glib_strv_concat_null(void) } static void -gjstest_test_func_util_glib_strv_concat_pointers(void) +gjstest_test_func_util_misc_strv_concat_pointers(void) { char *strv0[2] = {(char*)"foo", NULL}; char *strv1[1] = {NULL}; @@ -408,8 +408,10 @@ main(int argc, g_test_add_func("/gjs/jsutil/strip_shebang/only_shebang", gjstest_test_strip_shebang_advance_to_end_for_just_shebang); g_test_add_func("/gjs/profiler/start_stop", gjstest_test_profiler_start_stop); - g_test_add_func("/util/glib/strv/concat/null", gjstest_test_func_util_glib_strv_concat_null); - g_test_add_func("/util/glib/strv/concat/pointers", gjstest_test_func_util_glib_strv_concat_pointers); + g_test_add_func("/util/misc/strv/concat/null", + gjstest_test_func_util_misc_strv_concat_null); + g_test_add_func("/util/misc/strv/concat/pointers", + gjstest_test_func_util_misc_strv_concat_pointers); #define ADD_JSAPI_UTIL_TEST(path, func) \ g_test_add("/gjs/jsapi/util/" path, GjsUnitTestFixture, NULL, \ |