From 0a1f1614a730ddef715970847d0f6245548ca94b Mon Sep 17 00:00:00 2001 From: Mattias Gustavsson Date: Fri, 10 Sep 2021 10:41:49 +0200 Subject: [PATCH] Fixed path, attempt to fix tests failing on build machine --- auto_update/tests.cpp | 2 ++ installer/win/WixSharpInstaller/Symphony.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/auto_update/tests.cpp b/auto_update/tests.cpp index f4700281..218d906e 100644 --- a/auto_update/tests.cpp +++ b/auto_update/tests.cpp @@ -78,9 +78,11 @@ void ipc_tests() { clients[ i ] = ipc_client_connect( "test_pipe" ); TESTFW_EXPECTED( clients[ i ] ); } + Sleep(100); for( int i = 0; i < sizeof( clients ) / sizeof( *clients ); ++i ) { ipc_client_disconnect( clients[ i ] ); } + Sleep(100); } ipc_server_stop( server ); TESTFW_TEST_END(); diff --git a/installer/win/WixSharpInstaller/Symphony.cs b/installer/win/WixSharpInstaller/Symphony.cs index 869bee7b..f2f41307 100644 --- a/installer/win/WixSharpInstaller/Symphony.cs +++ b/installer/win/WixSharpInstaller/Symphony.cs @@ -28,7 +28,7 @@ class Script var userDataPathArgument = "--userDataPath=\"[USER_DATA_PATH]\""; - File updateService = new File(@"..\..\..\node_modules\auto-update\auto_update_service.exe"); + File updateService = new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_service.exe"); updateService.ServiceInstaller = new ServiceInstaller { Name = "auto_update_service", @@ -70,7 +70,7 @@ class Script } ), updateService, - new File(@"..\..\..\node_modules\auto-update\auto_update_helper.exe"), + new File(@"..\..\..\dist\win-unpacked\resources\app.asar.unpacked\node_modules\auto-update\auto_update_helper.exe"), new File(@"..\..\..\dist\win-unpacked\chrome_100_percent.pak"), new File(@"..\..\..\dist\win-unpacked\chrome_200_percent.pak"), new File(@"..\..\..\dist\win-unpacked\d3dcompiler_47.dll"),