This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11034

test-run-test: use explicit variables to clarify paths
ClosedPublic

Authored by marmoute on Jul 9 2021, 7:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGda497189a93a: test-run-test: use explicit variables to clarify paths
Summary

Since $TESTTMP and $TESTDIR are defined for both the main scope and the test
run during the test, the situation get confusing. To work around that, we
define some new, explicit, variables with the values we needs to keep track
of.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jul 9 2021, 7:48 AM
baymax updated this revision to Diff 29074.Jul 9 2021, 9:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 29094.Jul 9 2021, 11:41 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute retitled this revision from test-run-test: use explicit variable to clarify path to test-run-test: use explicit variables to clarify paths.Jul 10 2021, 1:44 PM
marmoute edited the summary of this revision. (Show Details)
marmoute added a commit: rHGda497189a93a: test-run-test: use explicit variables to clarify paths.Jul 11 2021, 10:46 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGda497189a93a: test-run-test: use explicit variables to clarify paths (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-run-tests.t (44 lines)

Diff 29187

tests/test-run-tests.t

ON_START! <__main__.TestSuite tests=[<__main__.TTest testMethod=test-failure.t>, <__main__.TTest testMethod=test-success.t>]> ON_START! <__main__.TestSuite tests=[<__main__.TTest testMethod=test-failure.t>, <__main__.TTest testMethod=test-success.t>]>
FAILURE! test-failure.t output changed FAILURE! test-failure.t output changed
SUCCESS! test-success.t SUCCESS! test-success.t
ON_END! ON_END!
Test reusability for third party tools Test reusability for third party tools
====================================== ======================================
$ mkdir "$TESTTMP"/anothertests $ THISTESTDIR="$TESTDIR"
$ cd "$TESTTMP"/anothertests $ export THISTESTDIR
$ THISTESTTMP="$TESTTMP"
$ export THISTESTTMP
#if windows
$ NEWTESTDIR="$THISTESTTMP"\\anothertests
#else
$ NEWTESTDIR="$THISTESTTMP"/anothertests
#endif
$ export NEWTESTDIR
$ echo creating some new test in: $NEWTESTDIR
creating some new test in: $TESTTMP\anothertests (windows !)
creating some new test in: $TESTTMP/anothertests (no-windows !)
$ mkdir "$NEWTESTDIR"
$ cd "$NEWTESTDIR"
test that `run-tests.py` can execute hghave, even if it runs not in test that `run-tests.py` can execute hghave, even if it runs not in
Mercurial source tree. Mercurial source tree.
$ cat > test-hghave.t <<EOF $ cat > test-hghave.t <<EOF
> #require true > #require true
> $ echo foo > $ echo foo
> foo > foo
> EOF > EOF
$ rt test-hghave.t $ rt test-hghave.t
running 1 tests using 1 parallel processes running 1 tests using 1 parallel processes
. .
# Ran 1 tests, 0 skipped, 0 failed. # Ran 1 tests, 0 skipped, 0 failed.
test that RUNTESTDIR refers the directory, in which `run-tests.py` now test that RUNTESTDIR refers the directory, in which `run-tests.py` now
running is placed. running is placed.
$ cat > test-runtestdir.t <<EOF $ cat > test-runtestdir.t <<EOF
> - $TESTDIR, in which test-run-tests.t is placed > # \$THISTESTDIR, in which test-run-tests.t (this test file) is placed
> - \$TESTDIR, in which test-runtestdir.t is placed (expanded at runtime) > # \$THISTESTTMP, in which test-run-tests.t (this test file) is placed
> - \$RUNTESTDIR, in which run-tests.py is placed (expanded at runtime) > # \$TESTDIR, in which test-runtestdir.t is placed (expanded at runtime)
> # \$RUNTESTDIR, in which run-tests.py is placed (expanded at runtime)
> >
> #if windows > $ test "\$TESTDIR" = "\$NEWTESTDIR"
> $ test "\$TESTDIR" = "$TESTTMP\\anothertests"
> #else
> $ test "\$TESTDIR" = "$TESTTMP"/anothertests
> #endif
> If this prints a path, that means RUNTESTDIR didn't equal > If this prints a path, that means RUNTESTDIR didn't equal
> TESTDIR as it should have. > THISTESTDIR as it should have.
> $ test "\$RUNTESTDIR" = "$TESTDIR" || echo "\$RUNTESTDIR" > $ test "\$RUNTESTDIR" = "\$THISTESTDIR" || echo "\$RUNTESTDIR"
> This should print the start of check-code. If this passes but the > This should print the start of check-code. If this passes but the
> previous check failed, that means we found a copy of check-code at whatever > previous check failed, that means we found a copy of check-code at whatever
> RUNTESTSDIR ended up containing, even though it doesn't match TESTDIR. > RUNTESTSDIR ended up containing, even though it doesn't match THISTESTDIR.
> $ head -n 3 "\$RUNTESTDIR"/../contrib/check-code.py | sed 's@.!.*python3@#!USRBINENVPY@' > $ head -n 3 "\$RUNTESTDIR"/../contrib/check-code.py | sed 's@.!.*python3@#!USRBINENVPY@'
> #!USRBINENVPY > #!USRBINENVPY
> # > #
> # check-code - a style and portability checker for Mercurial > # check-code - a style and portability checker for Mercurial
> EOF > EOF
$ rt test-runtestdir.t $ rt test-runtestdir.t
running 1 tests using 1 parallel processes running 1 tests using 1 parallel processes
. .