Fix the find_qmlimporter_path test on FreeBSD

arrowd · TheAssassin · commit 409307dd1614 · 2026-05-16T21:01:46.000+02:00
The qmlimportscanner executable is not necessarily located in /usr/bin across
all OSes, so only check that we located an executable with a fitting name.
diff --git a/lib/linuxdeploy b/lib/linuxdeploy
@@ -1 +1 @@
-Subproject commit cc7b86472c3caa3fd729b9dc502fd2aa78394257
+Subproject commit 3fdc95e75b6512430c59d4db12b28fa9bf0559c0
diff --git a/tests/test_deploy_qml.cpp b/tests/test_deploy_qml.cpp
@@ -52,10 +52,9 @@ namespace linuxdeploy {
 
                 TEST_F(TestDeployQml, find_qmlimporter_path) {
                     auto result = findQmlImportScanner();
-                    std::filesystem::path expected = "/usr/bin/qmlimportscanner";
 
                     ASSERT_FALSE(result.empty());
-                    ASSERT_EQ(result.string(), expected.string());
+                    ASSERT_EQ(result.filename().string(), "qmlimportscanner");
                 }
 
                 TEST_F(TestDeployQml, runQmlImportScanner) {

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,9 @@ namespace linuxdeploy {`
`52`	`52`
`53`	`53`	`TEST_F(TestDeployQml, find_qmlimporter_path) {`
`54`	`54`	`auto result = findQmlImportScanner();`
`55`		`- std::filesystem::path expected = "/usr/bin/qmlimportscanner";`
`56`	`55`
`57`	`56`	`ASSERT_FALSE(result.empty());`
`58`		`- ASSERT_EQ(result.string(), expected.string());`
	`57`	`+ ASSERT_EQ(result.filename().string(), "qmlimportscanner");`
`59`	`58`	`}`
`60`	`59`
`61`	`60`	`TEST_F(TestDeployQml, runQmlImportScanner) {`