fix: qml tests

- remove broken references to imports
This commit is contained in:
Roman
2026-07-22 08:57:32 +02:00
parent d3104ae78e
commit 4013466fc2
3 changed files with 15 additions and 37 deletions
+3 -34
View File
@@ -176,21 +176,6 @@
enableInspector = false;
};
# macOS distribution packages (only for Darwin)
appBundle = if pkgs.stdenv.isDarwin then
import ./nix/macos-bundle.nix {
inherit pkgs src;
app = appDistributed;
}
else null;
dmg = if pkgs.stdenv.isDarwin then
import ./nix/macos-dmg.nix {
inherit pkgs;
appBundle = appBundle;
}
else null;
# Distributed build with inspector enabled (for macOS integration tests)
appDistributedWithInspector = import ./nix/app.nix {
inherit pkgs common src logosModule logosSdk logosProtocolPkg logosQtSdk logosDesignSystem logosViewModuleRuntime buildInfo;
@@ -223,15 +208,6 @@
entitlements = ./app/macos/LogosBasecamp.entitlements;
}
else null;
# Linux AppImage (only for Linux)
appImage = if pkgs.stdenv.isLinux then
import ./nix/appimage.nix {
inherit pkgs src;
app = appDistributed;
version = common.version;
}
else null;
in
{
# Individual outputs
@@ -279,7 +255,7 @@
};
# QML component tests (Qt Quick Test)
qml-tests = import ./nix/qml-tests.nix { inherit pkgs src; };
qml-tests = import ./nix/qml-tests.nix { inherit pkgs src logosPackageHeaders; };
# Integration test (UI tests via Qt Inspector)
integration-test = import ./nix/integration-test.nix { inherit pkgs src logosQtMcp; appPkg = app; };
@@ -307,14 +283,7 @@
inherit logosQtMcp;
appBin = "${macosAppTest}/LogosBasecamp.app/Contents/MacOS/LogosBasecamp";
};
} // (if pkgs.stdenv.isDarwin then {
# macOS distribution outputs
app-bundle = appBundle;
inherit dmg;
} else {}) // (if pkgs.stdenv.isLinux then {
# Linux distribution output
appimage = appImage;
} else {})
}
);
checks = forAllSystems ({ pkgs, system, ... }: {
@@ -325,7 +294,7 @@
integration-test = self.packages.${system}.integration-test;
});
devShells = forAllSystems ({ pkgs, logosSdk, logosProtocolPkg, logosQtSdk, logosModule, logosLiblogos, logosPackageManagerLibrary, logosPackageManagerModule, logosCapabilityModule, logosPackageLib, logosDesignSystem, logosCppSdkSrc, logosLiblogosSrc, logosPackageManagerModuleSrc, logosCapabilityModuleSrc }: {
devShells = forAllSystems ({ pkgs, logosSdk, logosProtocolPkg, logosQtSdk, logosModule, logosLiblogos, logosPackageManagerLibrary, logosPackageManagerModule, logosCapabilityModule, logosPackageLib, logosDesignSystem, logosCppSdkSrc, logosLiblogosSrc, logosPackageManagerModuleSrc, logosCapabilityModuleSrc, ... }: {
default = pkgs.mkShell {
nativeBuildInputs = [
pkgs.cmake
+3 -2
View File
@@ -1,5 +1,5 @@
# Builds and runs basecamp's QML component tests (Qt Quick Test).
{ pkgs, src }:
{ pkgs, src, logosPackageHeaders }:
pkgs.stdenv.mkDerivation {
pname = "logos-basecamp-qml-tests";
@@ -22,7 +22,8 @@ pkgs.stdenv.mkDerivation {
buildPhase = ''
runHook preBuild
cmake -S tests/qml -B build-qml-tests -GNinja -DCMAKE_BUILD_TYPE=Debug
cmake -S tests/qml -B build-qml-tests -GNinja -DCMAKE_BUILD_TYPE=Debug \
-DLOGOS_PACKAGE_HEADERS="${logosPackageHeaders}/include"
cmake --build build-qml-tests
runHook postBuild
'';
+9 -1
View File
@@ -11,13 +11,21 @@ enable_testing()
set(BASECAMP_SRC "${CMAKE_CURRENT_SOURCE_DIR}/../../src")
if(DEFINED LOGOS_PACKAGE_HEADERS)
set(LOGOS_PACKAGE_HEADERS_INCLUDE "${LOGOS_PACKAGE_HEADERS}")
endif()
add_executable(qml_tests
main.cpp
${BASECAMP_SRC}/AppsModel.cpp
${BASECAMP_SRC}/AppsFilterProxy.cpp
${BASECAMP_SRC}/InstallEnums.cpp
${BASECAMP_SRC}/InstallRegistry.cpp # AppsModel depends on InstallRegistry
)
target_include_directories(qml_tests PRIVATE
${BASECAMP_SRC}
${LOGOS_PACKAGE_HEADERS_INCLUDE}
)
target_include_directories(qml_tests PRIVATE ${BASECAMP_SRC})
target_link_libraries(qml_tests PRIVATE
Qt6::Core
Qt6::Gui