github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 14:23:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unused return value errors in fish tests

Browse Source 
This error only happens on recent versions of gcc, see previous
commit e6bb7fc973 for more info.

Instead of using `ignore_result()` here, I've added a `system_assert`
function/macro that mimics the behavior of all the other `system()`
calls in the file.
This commit is contained in:
Mahmoud Al-Qudsi 2020-07-05 17:38:32 -05:00
parent d24a14744c
commit 791c4fb1dd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fish_tests.cpp
View File

@ -87,6 +87,9 @@
static const char *const *s_arguments;
static int s_test_run_count = 0;
#define system_assert(command) if (system(command)) \
{ err(L"Non-zero result on line %d: %s", __LINE__, command); }
// Indicate if we should test the given function. Either we test everything (all arguments) or we
// run only tests that have a prefix in s_arguments.
static bool should_test_function(const char *func_name) {
@ -3540,7 +3543,7 @@ static void test_universal() {
}
}
}
(void)system("rm -Rf test/fish_uvars_test/");
system_assert("rm -Rf test/fish_uvars_test/");
}
static void test_universal_output() {
@ -3661,7 +3664,7 @@ static void test_universal_callbacks() {
do_test(callbacks.at(1).val == wcstring{L"1"});
do_test(callbacks.at(2).key == L"delta");
do_test(callbacks.at(2).val == none());
(void)system("rm -Rf test/fish_uvars_test/");
system_assert("rm -Rf test/fish_uvars_test/");
}
static void test_universal_formats() {
@ -3710,7 +3713,7 @@ static void test_universal_ok_to_save() {
// Ensure file is same.
file_id_t after_id = file_id_for_path(UVARS_TEST_PATH);
do_test(before_id == after_id && "UVARS_TEST_PATH should not have changed");
(void)system("rm -Rf test/fish_uvars_test/");
system_assert("rm -Rf test/fish_uvars_test/");
}
bool poll_notifier(const std::unique_ptr<universal_notifier_t> &note) {