h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 03:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into death_of_fishd

Browse Source
This commit is contained in:
ridiculousfish
2014-04-27 18:53:35 -07:00
parent d7f22a0c27 97c2ec8dcf
commit 753c42a3d5
16 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fish_tests.cpp
View File

@@ -1331,7 +1331,7 @@ static void test_expand()
err(L"Expansion not correctly handling literal path components in dotfiles");
}
system("rm -Rf /tmp/fish_expand_test");
if (system("rm -Rf /tmp/fish_expand_test")) err(L"rm failed");
}
static void test_fuzzy_match(void)
@@ -2013,8 +2013,8 @@ static void test_autosuggest_suggest_special()
// A single quote should defeat tilde expansion
perform_one_autosuggestion_test(L"cd '~/test_autosuggest_suggest_specia'", wd, L"", __LINE__);
system("rm -Rf '/tmp/autosuggest_test/'");
system("rm -Rf ~/test_autosuggest_suggest_special/");
if (system("rm -Rf '/tmp/autosuggest_test/'")) err(L"rm failed");
if (system("rm -Rf ~/test_autosuggest_suggest_special/")) err(L"rm failed");
}
static void test_autosuggestion_combining()
@@ -3175,7 +3175,7 @@ static void test_highlighting(void)
// Generate the text
wcstring text;
std::vector<int> expected_colors;
std::vector<highlight_spec_t> expected_colors;
for (size_t i=0; i < component_count; i++)
{
if (i > 0)