Fix merge error with SPIFFS_MOCK

earlephilhower · earlephilhower · commit edd9476de857 · 2019-01-16T21:16:16.000-08:00
diff --git a/tests/host/fs/test_fs.cpp b/tests/host/fs/test_fs.cpp
@@ -53,7 +53,7 @@ static std::set<String> listDir (const char* path)
 
 TEST_CASE("SPIFFS checks the config object passed in", "[fs]")
 {
-    SPIFFS_MOCK_DECLARE(64, 8, 512, false);
+    SPIFFS_MOCK_DECLARE(64, 8, 512, "");
     FSConfig f;
     SPIFFSConfig s;
     SDFSConfig d;

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static std::set<String> listDir (const char* path)`
`53`	`53`
`54`	`54`	`TEST_CASE("SPIFFS checks the config object passed in", "[fs]")`
`55`	`55`	`{`
`56`		`- SPIFFS_MOCK_DECLARE(64, 8, 512, false);`
	`56`	`+ SPIFFS_MOCK_DECLARE(64, 8, 512, "");`
`57`	`57`	`FSConfig f;`
`58`	`58`	`SPIFFSConfig s;`
`59`	`59`	`SDFSConfig d;`