Merge branch 'master' into death_of_fishd

1 files changed, 4 insertions, 4 deletions

diff --git a/fish_tests.cpp b/fish_tests.cpp
index 7c76fb1c..b761f691 100644
--- a/fish_tests.cpp
+++ b/fish_tests.cpp
@@ -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)