Repository navigation
Commit 5060c9d
committed
Explain what each step in the init script achieves
This adds comments to init-tests-after-clone.sh to explain what
each of the steps is doing that is needed by some of the tests.
It also refactors some recently added logic, in a way that lends
itself to greater clarity when combined with these comments.1 parent f6dbba2 commit 5060c9d
1 file changed
Lines changed: 15 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -13,14 +13,26 @@ if test -z "$TRAVIS"; then | |||
| 13 | 13 | esac | |
| 14 | 14 | fi | |
| 15 | 15 | ||
| 16 | + # Stop if we have run this. (You can delete __testing_point__ to let it rerun.) | ||
| 17 | + # This also keeps track of where we are, so we can get back here. | ||
| 16 | 18 | git tag __testing_point__ | |
| 19 | + | ||
| 20 | + # The tests need a branch called master. | ||
| 17 | 21 | git checkout master -- || git checkout -b master | |
| 22 | + | ||
| 23 | + # The tests need a reflog history on the master branch. | ||
| 18 | 24 | git reset --hard HEAD~1 | |
| 19 | 25 | git reset --hard HEAD~1 | |
| 20 | 26 | git reset --hard HEAD~1 | |
| 27 | + | ||
| 28 | + # Point the master branch where we started, so we test the correct code. | ||
| 21 | 29 | git reset --hard __testing_point__ | |
| 22 | 30 | ||
| 23 | - test -z "$TRAVIS" || exit 0 # CI jobs will already have taken care of the rest. | ||
| 31 | + # Do some setup that CI takes care of but that may not have been done locally. | ||
| 32 | + if test -z "$TRAVIS"; then | ||
| 33 | + # The tests needs some version tags. Try to get them even in forks. | ||
| 34 | + git fetch --all --tags | ||
| 24 | 35 | ||
| 25 | - git fetch --all --tags | ||
| 26 | - git submodule update --init --recursive | ||
| 36 | + # The tests need submodules, including a submodule with a submodule. | ||
| 37 | + git submodule update --init --recursive | ||
| 38 | + fi | ||
0 commit comments