if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-27 01:11:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed path, attempt to fix tests failing on build machine

Browse Source
This commit is contained in:
Mattias Gustavsson 2021-09-10 10:41:49 +02:00
parent f205caeeb5
commit 0a1f1614a7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
auto_update/tests.cpp
View File

@ -78,9 +78,11 @@ void ipc_tests() {
clients[ i ] = ipc_client_connect( "test_pipe" ); clients[ i ] = ipc_client_connect( "test_pipe" );
TESTFW_EXPECTED( clients[ i ] ); TESTFW_EXPECTED( clients[ i ] );
} }
Sleep(100);
for( int i = 0; i < sizeof( clients ) / sizeof( *clients ); ++i ) { for( int i = 0; i < sizeof( clients ) / sizeof( *clients ); ++i ) {
ipc_client_disconnect( clients[ i ] ); ipc_client_disconnect( clients[ i ] );
} }
Sleep(100);
} }
ipc_server_stop( server ); ipc_server_stop( server );
TESTFW_TEST_END(); TESTFW_TEST_END();

4
installer/win/WixSharpInstaller/Symphony.cs
View File

@ -28,7 +28,7 @@ class Script
var userDataPathArgument = "--userDataPath=\"[USER_DATA_PATH]\""; 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 updateService.ServiceInstaller = new ServiceInstaller
{ {
Name = "auto_update_service", Name = "auto_update_service",
@ -70,7 +70,7 @@ class Script
} }
), ),
updateService, 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_100_percent.pak"),
new File(@"..\..\..\dist\win-unpacked\chrome_200_percent.pak"), new File(@"..\..\..\dist\win-unpacked\chrome_200_percent.pak"),
new File(@"..\..\..\dist\win-unpacked\d3dcompiler_47.dll"), new File(@"..\..\..\dist\win-unpacked\d3dcompiler_47.dll"),