[epiphany/mcatanzaro/ci-weirdness] Attempt to fix CI
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/ci-weirdness] Attempt to fix CI
- Date: Wed, 24 Aug 2022 20:08:38 +0000 (UTC)
commit 1be80dc4034e17bf9812af65db005ba1eecd284f
Author: Michael Catanzaro <mcatanzaro redhat com>
Date: Wed Aug 24 15:08:16 2022 -0500
Attempt to fix CI
What will this do?
tests/meson.build | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
---
diff --git a/tests/meson.build b/tests/meson.build
index d090af737..2bb04652a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,8 +6,6 @@ envs = [
'PATH=' + join_paths(meson.project_build_root(), 'src') + ':' + run_command('printenv', 'PATH', check:
true).stdout(),
]
-test_cargs = ['-UG_DISABLE_ASSERT']
-
if get_option('unit_tests').enabled()
# FIXME: The tests that need ephy-test-utils are all disabled....
#
@@ -24,7 +22,6 @@ if get_option('unit_tests').enabled()
# download_test = executable('test-ephy-download',
# 'ephy-download-test.c',
# dependencies: ephymain_dep,
- # c_args: test_cargs,
# )
# test('Download test',
# download_test,
@@ -35,7 +32,7 @@ if get_option('unit_tests').enabled()
'ephy-embed-shell-test.c',
adguard_resources,
dependencies: ephymain_dep,
- c_args: test_cargs + ['-DTEST_DIR="' + meson.current_source_dir() + '"'],
+ c_args: ['-DTEST_DIR="' + meson.current_source_dir() + '"'],
)
test('Embed shell test',
embed_shell_test,
@@ -45,7 +42,6 @@ if get_option('unit_tests').enabled()
embed_utils_test = executable('test-ephy-embed-utils',
'ephy-embed-utils-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('Embed utils test',
embed_utils_test,
@@ -55,7 +51,6 @@ if get_option('unit_tests').enabled()
encodings_test = executable('test-ephy-encodings',
'ephy-encodings-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('Encodings test',
encodings_test,
@@ -65,7 +60,6 @@ if get_option('unit_tests').enabled()
file_helpers_test = executable('test-ephy-file-helpers',
'ephy-file-helpers-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('File helpers test',
file_helpers_test,
@@ -75,7 +69,6 @@ if get_option('unit_tests').enabled()
history_test = executable('test-ephy-history',
'ephy-history-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('History test',
history_test,
@@ -85,7 +78,6 @@ if get_option('unit_tests').enabled()
location_entry_test = executable('test-location-entry',
'ephy-location-entry-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('Location entry test',
location_entry_test,
@@ -95,7 +87,6 @@ if get_option('unit_tests').enabled()
migration_test = executable('test-ephy-migration',
'ephy-migration-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('Migration test',
migration_test,
@@ -106,7 +97,6 @@ if get_option('unit_tests').enabled()
search_engine_manager_test = executable('test-ephy-search-engine-manager',
'ephy-search-engine-manager-test.c',
dependencies: ephymisc_dep,
- c_args: test_cargs,
)
test('Search engine manager test',
search_engine_manager_test,
@@ -117,7 +107,6 @@ if get_option('unit_tests').enabled()
# session_test = executable('test-ephy-session',
# 'ephy-session-test.c',
# dependencies: ephytestutils_dep,
- # c_args: test_cargs,
# )
# test('Session test',
# session_test,
@@ -130,7 +119,6 @@ if get_option('unit_tests').enabled()
# shell_test = executable('test-ephy-shell',
# 'ephy-shell-test.c',
# dependencies: ephytestutils_dep,
- # c_args: test_cargs,
# )
# test('Shell test',
# shell_test,
@@ -141,7 +129,6 @@ if get_option('unit_tests').enabled()
# snapshot_service_test = executable('test-snapshot-service',
# 'ephy-snapshot-service-test.c',
# dependencies: ephymain_dep,
- # c_args: test_cargs,
# )
# test('Snapshot service test',
# snapshot_service_test,
@@ -151,7 +138,6 @@ if get_option('unit_tests').enabled()
sqlite_test = executable('test-ephy-sqlite',
'ephy-sqlite-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('SQLite test',
sqlite_test,
@@ -161,7 +147,6 @@ if get_option('unit_tests').enabled()
string_test = executable('test-ephy-string',
'ephy-string-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('String test',
string_test,
@@ -184,7 +169,6 @@ if get_option('unit_tests').enabled()
gsb_service_test = executable('test-ephy-gsb-service',
'ephy-gsb-service-test.c',
dependencies: ephymain_dep,
- c_args: test_cargs,
)
test('GSB service test',
gsb_service_test,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]