tests: Use a (stable) relative submodule location

This ensures that the content (and hence the EVTag) stays identical even if the testing code generates different temporary directories.
cgwalters · Jul 14, 2015 · c1e05e8 · c1e05e8
1 parent 3ce438a
commit c1e05e8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/libtest.sh b/tests/libtest.sh
@@ -139,7 +139,7 @@ setup_test_repository () {
     git push --set-upstream origin master
 
     cd ${test_tmpdir}/coolproject
-    git submodule add file://${test_tmpdir}/repos/subproject subproject 
+    git submodule add ../subproject subproject 
     git add subproject
     echo '#include subproject/src/libsub.c' >> src/cool.c
     gitcommit_inctime -a -m 'Add libsub'

diff --git a/tests/test-basic.sh b/tests/test-basic.sh
@@ -35,9 +35,9 @@ cd coolproject
 git submodule update --init
 with_editor_script git evtag -u 472CDAFA v2015.1
 git show refs/tags/v2015.1 > tag.txt
-assert_file_has_content tag.txt 'Git-EVTag-EXPERIMENTAL-v0-SHA512: 9a08bd77a94e3623f128a8e688aa39837e9a0d8d20ad1e6fff9954f3266efa64bc4ecbcc3caa196110dd14e37926190d860cbc7e16cec48d7d1d43e70c239690'
+assert_file_has_content tag.txt 'Git-EVTag-EXPERIMENTAL-v0-SHA512: 58e9834248c054f844f00148a030876f77eb85daa3caa15a20f3061f181403bae7b7e497fca199d25833b984c60f3202b16ebe0ed3a36e6b82f33618d75c569d'
 with_editor_script git evtag --verify v2015.1 | tee verify.out
-assert_file_has_content verify.out 'Successfully verified: Git-EVTag-EXPERIMENTAL-v0-SHA512: 9a08bd77a94e3623f128a8e688aa39837e9a0d8d20ad1e6fff9954f3266efa64bc4ecbcc3caa196110dd14e37926190d860cbc7e16cec48d7d1d43e70c239690'
+assert_file_has_content verify.out 'Successfully verified: Git-EVTag-EXPERIMENTAL-v0-SHA512: 58e9834248c054f844f00148a030876f77eb85daa3caa15a20f3061f181403bae7b7e497fca199d25833b984c60f3202b16ebe0ed3a36e6b82f33618d75c569d'
 rm -f tag.txt
 rm -f verify.out
 echo "ok tag + verify"