Added scope_exit, which is very helpful for handling situations where the test exits early.

source/scope_exit.h

@@ -0,0 +1,37 @@
+// Copyright 2014 Citra Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+namespace detail {
+    template <typename Func>
+    struct ScopeExitHelper {
+        explicit ScopeExitHelper(Func&& func) : func(std::move(func)) {}
+        ~ScopeExitHelper() { func(); }
+
+        Func func;
+    };
+
+    template <typename Func>
+    ScopeExitHelper<Func> ScopeExit(Func&& func) { return ScopeExitHelper<Func>(std::move(func)); }
+}
+
+/**
+ * This macro allows you to conveniently specify a block of code that will run on scope exit. Handy
+ * for doing ad-hoc clean-up tasks in a function with multiple returns.
+ *
+ * Example usage:
+ * \code
+ * const int saved_val = g_foo;
+ * g_foo = 55;
+ * SCOPE_EXIT({ g_foo = saved_val; });
+ *
+ * if (Bar()) {
+ *     return 0;
+ * } else {
+ *     return 20;
+ * }
+ * \endcode
+ */
+#define SCOPE_EXIT(body) auto scope_exit_helper_##__LINE__ = detail::ScopeExit([&]() body)

source/tests/fs/fs_sdmc.cpp

@@ -70,6 +70,10 @@ static bool TestFileWriteRead(FS_archive sdmcArchive)
     
     // Create file
     FSUSER_OpenFile(NULL, &fileHandle, sdmcArchive, filePath, FS_OPEN_CREATE | FS_OPEN_WRITE, 0);
+    SCOPE_EXIT({ // Close and delete file no matter what happens
+        FSFILE_Close(fileHandle);
+        FSUSER_DeleteFile(NULL, sdmcArchive, filePath);
+    });
     
     // Write to file
     SoftAssert(FSFILE_Write(fileHandle, &bytesWritten, 0, stringWritten, strlen(stringWritten)+1, FS_WRITE_FLUSH) == 0);
@@ -87,9 +91,6 @@ static bool TestFileWriteRead(FS_archive sdmcArchive)
     // Verify string contents
     SoftAssert(strcmp(stringRead.get(), stringWritten) == 0);
     
-    FSFILE_Close(fileHandle);
-    FSUSER_DeleteFile(NULL, sdmcArchive, filePath);
-    
     return true;
 }