lmi
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi] PATCH: Assorted fixes for the CI builds


From: Vadim Zeitlin
Subject: [lmi] PATCH: Assorted fixes for the CI builds
Date: Mon, 13 Jun 2022 00:14:00 +0200

 Hello,

 I'd like to merge https://github.com/let-me-illustrate/lmi/pull/217 based
on xanadu/ci-fixes branch using your branch name. It mostly consists of
simple changes to configure.ac and ci.yml that I could push myself, but it
also makes one small, but required, change to workhorse.make, which is just
this:

---------------------------------- >8 --------------------------------------
diff --git a/workhorse.make b/workhorse.make
index d7742c836..4ae7dd071 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -1364,7 +1364,7 @@ run_unit_tests: unit_tests_not_built $(addsuffix 
-run,$(unit_test_binaries))
 .PHONY: %$(EXEEXT)-run
 %$(EXEEXT)-run:
        @printf '\n%s\n' "Running $*:"
-       @-$(PERFORM) ./$* --accept
+       @-$(PERFORM) ./$*$(EXEEXT) --accept

 
################################################################################

---------------------------------- >8 --------------------------------------

 The corresponding commit message explains in more details why is this
needed, but suffice it to say that without this change none of the tests
runs at all with Wine 7.

 I hesitated to include a similar change to nychthemeral_test.sh, where it
is also clearly going to be needed once you update to Wine 7, but I'm not
set up to actually test it, so I didn't do it -- please let me know if
you'd like me to do it or if you'll do it yourself.

 Worse, I was so fixed on fixing the CI builds that I didn't think to check
where else it might be needed, but checking it now, I see that it's also
needed for

- XMLLINT definition in msw_generic.make
- In test_coding_rules_test.sh (but not the concinnity target in the main
  makefile, as TEST_CODING_RULES already includes the extension)
- For generate_passkey in workhorse.make

 Again, please let me know if you'd like me to add the corresponding
changes to this branch or if you'd rather make them yourself.

 But it would be very nice if you could please already merge the changes
that are currently in this branch in order to let the CI builds pass again.

 Thanks in advance!
VZ

Attachment: pgpggXPAvoxYa.pgp
Description: PGP signature


reply via email to

[Prev in Thread] Current Thread [Next in Thread]