Skip to content

Conversation

@paveljanik
Copy link
Contributor

As qa/pull-tester/tests-config.sh.in was moved to qa/pull-tester/tests_config.py.in in #6616, adapt its .gitignore entry to match new name.

@paveljanik paveljanik changed the title tests-config.sh is superseded by tests_config.py [skip ci] [Trivial] tests-config.sh is superseded by tests_config.py [skip ci] Oct 5, 2015
@laanwj laanwj added the Tests label Oct 5, 2015
@laanwj
Copy link
Member

laanwj commented Oct 5, 2015

ACK

@fanquake
Copy link
Member

fanquake commented Oct 6, 2015

ACK

On Tuesday, October 6, 2015, Wladimir J. van der Laan <
[email protected]> wrote:

ACK


Reply to this email directly or view it on GitHub
#6762 (comment).

@laanwj
Copy link
Member

laanwj commented Oct 6, 2015

Next time we should try to look for these things in the review, so they don't require lots of additional pulls to fix up.

@laanwj laanwj merged commit a19504b into bitcoin:master Oct 6, 2015
laanwj added a commit that referenced this pull request Oct 6, 2015
a19504b tests-config.sh is superseded by tests_config.py (Pavel Janík)
@paveljanik
Copy link
Contributor Author

Yup. Maybe we should add the result of git status to the travis build logs?

@laanwj
Copy link
Member

laanwj commented Oct 6, 2015

I think that's a good idea @theuni can we add a 'tree is clean post-build' check to Travis? It may be complicated by the fact that we're building from a make distdir.

@theuni
Copy link
Member

theuni commented Oct 7, 2015

It's ugly, but this works locally:

diff --git a/.travis.yml b/.travis.yml
index c878514..68362f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -70,4 +70,5 @@ script:
     - if [ "$RUN_TESTS" = "true" ]; then make check; fi
     - if [ "$RUN_TESTS" = "true" ]; then qa/pull-tester/rpc-tests.sh; fi
 after_script:
-    - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then (echo "Upload goes here. Something like: scp -r $BASE_OUTDIR server" || echo "upload failed"); fi
+    - echo "Checking for left-over files..."
+    - (export GIT_WORK_TREE=.; git ls-files "*.gitignore" | git checkout-index -q --stdin && git ls-files --error-unmatch -- `git ls-files --exclude-standard -o`) && echo "OK"

It grabs the missing .gitignore files (they're not distributed), then uses a GIT_WORK_TREE trick to fool git into acting on the distdir.

It's rather kludgy for the travis file, but I can't imagine it's useful enough to break out on its own. Want me to PR it that way?

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants