Replace builtin unmount smoke test

Author: AnastaZIuk

include/nbl/system/ISystem.h

@@ -143,6 +143,7 @@ class NBL_API2 ISystem : public core::IReferenceCounted
 
         void unmountBuiltins();
 		bool areBuiltinsMounted() const;
+        inline size_t getMountedArchiveCount() const { return m_cachedArchiveFiles.getSize(); }
 
         //
         struct SystemInfo

tools/nsc/CMakeLists.txt

@@ -269,9 +269,6 @@ set(NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME $<TARGET_FILE_NAME:${EXECUTABLE_NAME}
 set(NBL_NSC_PREINSTALL_TARGET_EXE_FILEPATH "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}/${NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME}")
 set(NBL_NSC_BUILD_INFO_FILENAME build-info.json)
 set(NBL_NSC_PREINSTALL_TARGET_BUILD_INFO "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}/${NBL_NSC_BUILD_INFO_FILENAME}")
-set(NBL_NSC_UNMOUNT_TEST_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/test/hlsl/unmount/input.hlsl")
-set(NBL_NSC_UNMOUNT_TEST_INCLUDE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/test/hlsl/unmount/overlay")
-set(NBL_NSC_UNMOUNT_TEST_OUTPUT "${NBL_NSC_COMPILE_DIRECTORY}/unmount.preprocessed.hlsl")
 
 add_test(NAME NBL_NSC_COMPILE_AT_EXE_CWD_TEST
 	COMMAND "${NBL_NSC_PREINSTALL_TARGET_EXE_FILENAME}" ${NBL_NSC_COMPILE_COMMAND}
@@ -290,13 +287,9 @@ add_test(NAME NBL_NSC_DUMP_BUILD_INFO_TEST
   COMMAND_EXPAND_LISTS
 )
 
-add_test(NAME NBL_NSC_NO_NBL_BUILTINS_UNMOUNT_TEST
+add_test(NAME NBL_NSC_SELF_TEST_UNMOUNT_BUILTINS
 	COMMAND "${NBL_NSC_PREINSTALL_TARGET_EXE_FILEPATH}"
-		-P
-		-no-nbl-builtins
-		-Fc "${NBL_NSC_UNMOUNT_TEST_OUTPUT}"
-		-I "${NBL_NSC_UNMOUNT_TEST_INCLUDE_ROOT}"
-		"${NBL_NSC_UNMOUNT_TEST_INPUT}"
+		--self-test-unmount-builtins
 	WORKING_DIRECTORY "${NBL_NSC_PREINSTALL_TARGET_EXE_DIRECTORY}"
 	COMMAND_EXPAND_LISTS
 )

tools/nsc/main.cpp

@@ -166,6 +166,7 @@ class ShaderCompiler final : public IApplicationFramework
 
         argparse::ArgumentParser program("nsc");
         program.add_argument("--dump-build-info").default_value(false).implicit_value(true);
+        program.add_argument("--self-test-unmount-builtins").default_value(false).implicit_value(true);
         program.add_argument("--file").default_value(std::string{});
         program.add_argument("-P").default_value(false).implicit_value(true);
         program.add_argument("-no-nbl-builtins").default_value(false).implicit_value(true);
@@ -206,6 +207,26 @@ class ShaderCompiler final : public IApplicationFramework
         if (!m_system)
             return false;
 
+        if (program.get<bool>("--self-test-unmount-builtins"))
+        {
+            const auto mountedArchiveCount = m_system->getMountedArchiveCount();
+            if (!mountedArchiveCount)
+            {
+                std::cerr << "Builtins were not mounted at startup.\n";
+                return false;
+            }
+
+            m_system->unmountBuiltins();
+
+            if (const auto remainingArchiveCount = m_system->getMountedArchiveCount(); remainingArchiveCount != 0ull)
+            {
+                std::cerr << "Builtins unmount self-test failed. Remaining mounted archives: " << remainingArchiveCount << "\n";
+                return false;
+            }
+
+            return true;
+        }
+
         if (rawArgs.size() < 2)
         {
             std::cerr << "Insufficient arguments.\n";