Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Windows App SDK Installer] Functional Test Fixes #4947

Merged
merged 2 commits into from
Dec 10, 2024
Merged

[Windows App SDK Installer] Functional Test Fixes #4947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9f67a6
test fixes
ssparach Dec 9, 2024
7122d49
incorporate PR suggestions
ssparach Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion installer/dev/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ int wmain(int argc, wchar_t *argv[])
else if ((arg == L"-?") || (arg == L"--help"))
{
DisplayHelp();
return 1;
return 0;
}
else if ((arg == L"--info"))
{
Expand Down
5 changes: 2 additions & 3 deletions installer/test/InstallerFunctionalTests/constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
#define CONFIGURATION L"Release"
#endif

#define BUILDOUTPUT_DIR L"BuildOutput"
#define INSTALLER_DIR L"WindowsAppRuntimeInstall"
#define INSTALLER_FILENAME L"WindowsAppRuntimeInstall-" ARCH L"exe"
#define INSTALLER_EXE_PATH BUILDOUTPUT_DIR L"\\" CONFIGURATION L"\\" ARCH L"\\" INSTALLER_DIR L"\\" INSTALLER_FILENAME
#define INSTALLER_FILENAME L"WindowsAppRuntimeInstall-" ARCH L".exe"
#define INSTALLER_EXE_PATH INSTALLER_DIR L"\\" INSTALLER_FILENAME

namespace WindowsAppRuntimeInstallerTests
{
Expand Down
6 changes: 5 additions & 1 deletion installer/test/InstallerFunctionalTests/helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ namespace WindowsAppRuntimeInstallerTests

std::filesystem::path GetModulePath(HMODULE hmodule)
{
if (hmodule == NULL)
{
hmodule = GetModuleHandle(L"InstallerFunctionalTests.dll");
}
auto path{ GetModuleFileName(hmodule) };
return path.remove_filename();
}
Expand All @@ -134,7 +138,7 @@ namespace WindowsAppRuntimeInstallerTests

// TAEF runs as a package under the installer, so we have to go way up the parent root in order to
// get to the common project root and then get to the build output.
return path.parent_path().parent_path().parent_path().parent_path().parent_path().parent_path().parent_path();
return path.parent_path().parent_path();
}

std::filesystem::path GetInstallerPath()
Expand Down