2 files changed, 19 insertions, 3 deletions
diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt
index e6ff142626..40837c8abb 100644
--- a/indra/integration_tests/llimage_libtest/CMakeLists.txt
+++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt
@@ -9,7 +9,6 @@ include(00-Common)
 include(LLCommon)
 include(LLImage)
 include(LLMath)
-include(LLKDU)
 
 set(llimage_libtest_SOURCE_FILES
     llimage_libtest.cpp
@@ -26,6 +25,18 @@ add_executable(llimage_libtest
     ${llimage_libtest_SOURCE_FILES}
     )
 
+set_target_properties(llimage_libtest
+                    PROPERTIES
+                    FOLDER "Tests"
+                    )
+
+if(DARWIN)
+    set_target_properties(llimage_libtest
+                        PROPERTIES
+                        OSX_ARCHITECTURES ${LL_MACOS_TEST_ARCHITECTURE}
+                        )
+endif()
+
 # Libraries on which this application depends on
 # Sort by high-level to low-level
 target_link_libraries(llimage_libtest
diff --git a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
index c45bd6fd01..85c5a8cdd4 100644
--- a/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
+++ b/indra/integration_tests/llimage_libtest/llimage_libtest.cpp
@@ -329,7 +329,7 @@ public:
 
     void run()
     {
-        std::ofstream os(mFile.c_str());
+        llofstream os(mFile.c_str());
 
         while (!sAllDone)
         {
@@ -345,6 +345,11 @@ public:
 
 int main(int argc, char** argv)
 {
+    // Call Tracy first thing to have it allocate memory
+    // https://github.com/wolfpld/tracy/issues/196
+    LL_PROFILER_FRAME_END;
+    LL_PROFILER_SET_THREAD_NAME("App");
+
     // List of input and output files
     std::list<std::string> input_filenames;
     std::list<std::string> output_filenames;
@@ -525,7 +530,7 @@ int main(int argc, char** argv)
             }
             else
             {
-                LLFastTimer::sMetricLog = TRUE;
+                LLFastTimer::sMetricLog = true;
                 LLFastTimer::sLogName = test_name;
                 arg += 1;                   // Skip that arg now we know it's a valid test name
                 if ((arg + 1) == argc)      // Break out of the loop if we reach the end of the arg list