[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lmi] Tests PR 174 (was: Can't get GUI test to run for pc-linux-gnu)
From: |
Greg Chicares |
Subject: |
Re: [lmi] Tests PR 174 (was: Can't get GUI test to run for pc-linux-gnu) |
Date: |
Wed, 24 Mar 2021 19:43:41 +0000 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 |
On 3/24/21 1:58 AM, Vadim Zeitlin wrote:
> On Wed, 24 Mar 2021 00:45:07 +0000 Greg Chicares <gchicares@sbcglobal.net>
> wrote:
>
> GC> On 3/23/21 10:00 PM, Vadim Zeitlin wrote:
> [...]
> GC> > I'd like to ask you once again if you could please merge the PR fixing
> the
> GC> > tests with autotools and adding them to the CI builds from
> GC> > https://github.com/let-me-illustrate/lmi/pull/174
> GC> Maybe I can look at it tomorrow.
I haven't finished testing it, but I'm pushing it now,
because that makes it easier to test on the corporate
server.
Please take a look at commit 593a7121f737, which may be
erroneous. As the commit message explains, I did this:
$git cherry-pick e571a6e11..2769d69ba xanadu/automake-libtest
$git status
On branch master
Your branch is ahead of 'origin/master' by 28 commits.
(use "git push" to publish your local commits)
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: third_party/wx (new commits)
and blindly followed the "git add" advice. Now it looks
like I should have ignored it...and instead have used
"git restore" to discard it? Is that the proper way to
get git-status to report that everything's clean?
Here are the two commits of concern, and it appears
that the second undoes the first:
commit 41bd0a36df7d6ff577b6313193041c71a0e6d56c
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Date: 2021-03-22T17:54:12+00:00
[...]
diff --git a/third_party/wx b/third_party/wx
index 6cdaedd42..c9486f9ce 160000
--- a/third_party/wx
+++ b/third_party/wx
@@ -1 +1 @@
-Subproject commit 6cdaedd42ba59331b3dc4ead50e0bac76ae14c19
+Subproject commit c9486f9cebb2843fdd3cb3e6433045644c456e38
commit 593a7121f7373b2900e29adf3e7c97f754ef0995
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Date: 2021-03-24T15:22:10+00:00
[...]
diff --git a/third_party/wx b/third_party/wx
index c9486f9ce..6cdaedd42 160000
--- a/third_party/wx
+++ b/third_party/wx
@@ -1 +1 @@
-Subproject commit c9486f9cebb2843fdd3cb3e6433045644c456e38
+Subproject commit 6cdaedd42ba59331b3dc4ead50e0bac76ae14c19
- [lmi] Can't get GUI test to run for pc-linux-gnu, Greg Chicares, 2021/03/18
- Re: [lmi] Can't get GUI test to run for pc-linux-gnu, Vadim Zeitlin, 2021/03/23
- Re: [lmi] Tests PR 174 (was: Can't get GUI test to run for pc-linux-gnu), Greg Chicares, 2021/03/24
- Re: [lmi] Tests PR 174, Vadim Zeitlin, 2021/03/24
- Re: [lmi] Tests PR 174, Greg Chicares, 2021/03/25
- Re: [lmi] Dependencies and submodules (was: Tests PR 174), Vadim Zeitlin, 2021/03/25
- Re: [lmi] Dependencies and submodules (was: Tests PR 174), Greg Chicares, 2021/03/25
- Re: [lmi] Dependencies and submodules, Vadim Zeitlin, 2021/03/25