diff options
| author | Phaedrus Leeds <mwleeds@protonmail.com> | 2021-10-19 17:13:00 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-19 17:13:00 -0700 |
| commit | 14b375e09aaf1f015581fb37b4f1d152668bf769 (patch) | |
| tree | 443775f29c38f330b40f00a88fd3ff0da38383f8 | |
| parent | cd023ed0914782ba0dbaa6f2352cfad3469e97d3 (diff) | |
| parent | 96dbe28cfa96e80b23fa1d8072eb36edad41279c (diff) | |
| download | flatpak-14b375e09aaf1f015581fb37b4f1d152668bf769.tar.gz | |
Merge pull request #4496 from jtojnar/test-exports-binary-path
tests: Allow FLATPAK_BINARY=flatpak for exports
| -rwxr-xr-x | tests/test-bundle.sh | 2 | ||||
| -rw-r--r-- | tests/test-run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh index 487b0735..53568fdb 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh @@ -67,7 +67,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten -assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" +assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh index b28cf7b6..4f785f9d 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh @@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten -assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" +assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini assert_file_has_content $FL_DIR/exports/share/gnome-shell/search-providers/org.test.Hello.search-provider.ini "^DefaultDisabled=true$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png |