Skip to content

tests: use ninja-build if ninja is not available#6544

Merged
martinpitt merged 1 commit intosystemd:masterfrom
evverx:use-ninja-or-ninja-build
Aug 7, 2017
Merged

tests: use ninja-build if ninja is not available#6544
martinpitt merged 1 commit intosystemd:masterfrom
evverx:use-ninja-or-ninja-build

Conversation

@evverx
Copy link
Contributor

@evverx evverx commented Aug 6, 2017

This makes the tests work on CentOS, which currently has ninja-build only.

@evverx
tests: use ninja-build if ninja is not available
f7a564b 
This makes the tests work on CentOS, which currently has ninja-build
only.
@evverx evverx added the tests label Aug 6, 2017
@evverx evverx mentioned this pull request Aug 6, 2017
Merged
@evverx
Copy link
Contributor Author

evverx commented Aug 6, 2017

In https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-xenial-pitti-systemd-semaphore/xenial/amd64/s/systemd-upstream/20170806_031405_df843@/log.gz I've found the following:

========== TEST-01-BASIC ==========
make: Entering directory '/tmp/autopkgtest.PdAhTS/build.nKA/debian/test/TEST-01-BASIC'
...
F: ninja was not found
Makefile:4: recipe for target 'setup' failed

. I have run the tests on Xenial and everything worked well. @martinpitt, do you know if there
is some magic happening to the tests which prevents type -P ninja from working?

@evverx
Copy link
Contributor Author

evverx commented Aug 6, 2017

In https://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/tests/upstream#n14 I see the following comment:

# modify the image build scripts to install systemd from the debs instead of
# from a "make/ninja install" as we don't have a built tree here. Also call
# systemd-nspawn from the system.

, so it seems that ninja is not installed on testbeds and ninja is not found. I think this should be fixed in https://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/tests/upstream by yet another sed s///. @martinpitt, what do you think?

@evverx
Copy link
Contributor Author

evverx commented Aug 6, 2017

@martinpitt, I've created the patch where _ninja_bin=.* is replaced with _ninja_bin=dummy-ninja.

@keszybz
Copy link
Member

keszybz commented Aug 6, 2017

Patch looks good, but I'll wait for @martinpitt to comment how he want to handle the ubuntu side.

@martinpitt
Copy link
Contributor

martinpitt commented Aug 7, 2017

Thanks @evverx ! Committed with a slightly changed changelog. Tests retried.

martinpitt
martinpitt approved these changes Aug 7, 2017
View reviewed changes
Copy link
Contributor

@martinpitt martinpitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests are now green.

@martinpitt martinpitt merged commit ca992ec into systemd:master Aug 7, 2017
poettering pushed a commit to systemd/systemd-centos-ci that referenced this pull request Aug 7, 2017
@evverx @poettering
bootstrap: switch to meson (#15)
c099651 
This should be merged and enabled after systemd/systemd#6544
is merged.
@evverx evverx deleted the use-ninja-or-ninja-build branch August 7, 2017 12:54
andir pushed a commit to andir/systemd that referenced this pull request Sep 7, 2017
@evverx @andir
tests: use ninja-build if ninja is not available (systemd#6544)
e3d6a0c 
This makes the tests work on CentOS, which currently has ninja-build
only.
andir pushed a commit to andir/systemd that referenced this pull request Sep 22, 2017
@evverx @andir
tests: use ninja-build if ninja is not available (systemd#6544)
92789cc 
This makes the tests work on CentOS, which currently has ninja-build
only.
manover pushed a commit to manover/systemd that referenced this pull request Oct 8, 2017
@evverx @martinpitt
debian/tests/upstream: Disable check for ninja executable
22a7c05 
_ninja_bin was added in systemd/systemd#6544 in
order to make the tests work on CentOS. As we don't actually do a "ninja
install" and ninja is not available, replace the check with a dummy
value.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@martinpitt martinpitt martinpitt approved these changes

@keszybz keszybz keszybz approved these changes

Assignees

No one assigned

Labels

tests

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@evverx @keszybz @martinpitt