github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-17 17:32:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for cross-test interference where cancellation from one test would

Browse Source 
lead to failure in expansion test
This commit is contained in:
ridiculousfish 2014-01-03 15:27:39 -08:00
parent 993148552e
commit b8079953d8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fish_tests.cpp
View File

@ -710,6 +710,7 @@ static void test_cancellation()
/* Here the command substitution is an infinite loop. echo never even gets its argument, so when we cancel we expect no output */
test_1_cancellation(L"echo (while true ; echo blah ; end)");
fprintf(stderr, ".");
/* Nasty infinite loop that doesn't actually execute anything */
@ -724,9 +725,13 @@ static void test_cancellation()
fprintf(stderr, "\n");
/* Restore signal handling */
proc_pop_interactive();
signal_reset_handlers();
/* Ensure that we don't think we should cancel */
reader_reset_interrupted();
}
static void test_indents()
@ -970,13 +975,13 @@ static int expand_test(const wchar_t *in, int flags, ...)
size_t i=0;
int res=1;
wchar_t *arg;
if (expand_string(in, output, flags))
{
}
#if 0
printf("input: %ls\n", in);
for (size_t idx=0; idx < output.size(); idx++)
{
printf("%ls\n", output.at(idx).completion.c_str());