Drop "ostree trivial-httpd" CLI, move to tests directory

[cgwalters]

See #1593

Basically this makes it easier for people packaging, as the trivial-httpd
is only for tests, and this way the binary will live with the tests.

Also at this point nothing should depend on ostree trivial-httpd.

[jtojnar]

Thanks, this works splendidly: NixOS/nixpkgs#40923 (comment)

[jlebon]

Looks like RPM build errors:

error: File not found: /srv/code/tests/installed/build/.build/ostree-2018.5.51.g5d1bf343-1.fc28.x86_64/usr/libexec/libostree/ostree-trivial-httpd


RPM build errors:
    bogus date in %changelog: Sat Aug 25 2013 Colin Walters <[email protected]> - 2013.5-3
    bogus date in %changelog: Sat Aug 25 2013 Colin Walters <[email protected]> - 2013.5-2
    File not found: /srv/code/tests/installed/build/.build/ostree-2018.5.51.g5d1bf343-1.fc28.x86_64/usr/libexec/libostree/ostree-trivial-httpd
    File listed twice: /usr/share/gtk-doc/html/ostree
    File not found: /srv/code/tests/installed/build/.build/ostree-2018.5.51.g5d1bf343-1.fc28.x86_64/usr/libexec/libostree/ostree-trivial-httpd

[smcv]

The file list in whatever spec file you're using (which doesn't seem to be in-tree) will need to be updated for ostree-trivial-httpd's new location (and so will my Debian packaging, but that isn't in upstream CI). I'm already installing ostree-trivial-httpd into ostree-tests.deb alongside the installed-tests since 2017.1-1.

[rh-atomic-bot]

☔ The latest upstream changes (presumably #1912) made this pull request unmergeable. Please resolve the merge conflicts.

[dbnicholson]

This is old, but I was looking at this in the context of endlessm/eos-updater#281 because we use it there for testing. Regardless of where it's installed, at the moment we'd still use it. 2 questions, though:

• Is it OK for an external project to use it? It sorta seems like we shouldn't do that, but it's a convenient tool.
• If it is OK to use, would it be possible to export the path to find it in the pkgconfig file? If moving it to the installed test directory, I think you'd need something like this:

diff --git a/src/libostree/ostree-1.pc.in b/src/libostree/ostree-1.pc.in
index 9a4debce..60b6aa4b 100644
--- a/src/libostree/ostree-1.pc.in
+++ b/src/libostree/ostree-1.pc.in
@@ -1,7 +1,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
+libexecdir=@libexecdir@
 includedir=@includedir@
+datadir=@datadir@
+installed_testdir=@installed_testdir@
+installed_test_metadir=@installed_test_metadir@
 features=@OSTREE_FEATURES@
 
 Name: OSTree

The installed_test_metadir is just there for completeness, but with this change you'd find ostree-trivial-httpd as $(pkg-config --variable installed_testdir ostree-1)/ostree-trivial-httpd. That's kind of improper, though, as ostree-1.pc describes libostree, not the ostree installed test suite.

[jtojnar]

If this were to be listed in a pkg-config file, it would be nice to use a separate one so that it could be packaged separately and installed independently from the devel files.

[dbnicholson]

If this were to be listed in a pkg-config file, it would be nice to use a separate one so that it could be packaged separately and installed independently from the devel files.

Right. I guess ostree-tests.pc? I think that could be done separately from this.

[openshift-ci-robot]

@cgwalters: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[openshift-ci]

@cgwalters: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/sanity	a0db5e9	link	true	/test sanity

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[dbnicholson]

I forgot about this PR. FWIW, I ported eos-updater to use its own soup server for testing and flatpak switched to a python HTTP server for testing some time ago. To my knowledge, those were the only non-ostree users of trivial-httpd. So, I support going ahead with this change, although it will need to be rebased.

[cgwalters]

Ah nice, thanks for the ping. Rebased 🏄

[cgwalters]

Hmm, not yet sure why the command isn't being found (built?) for soup3