-
Notifications
You must be signed in to change notification settings - Fork 204
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
replace harcoded pattern for reproducible archives command for call t…
…o filetools.reproducible_archive_cmd
- Loading branch information
Showing
1 changed file
with
8 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2939,16 +2939,11 @@ def run_check(): | |
'git_repo': '[email protected]:easybuilders/testrepository.git', | ||
'test_prefix': self.test_prefix, | ||
} | ||
reprod_tar_cmd_pattern = ( | ||
r' running shell command "find {} -name \".git\" -prune -o -print0 -exec touch -t 197001010100 {{}} \; |' | ||
r' LC_ALL=C sort --zero-terminated | tar --create --no-recursion --owner=0 --group=0 --numeric-owner' | ||
r' --format=gnu --null --files-from - | gzip --no-name > %(test_prefix)s/target/test.tar.gz' | ||
) | ||
|
||
expected = '\n'.join([ | ||
r' running shell command "git clone --depth 1 --branch tag_for_tests %(git_repo)s"', | ||
r" \(in .*/tmp.*\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -2957,7 +2952,7 @@ def run_check(): | |
expected = '\n'.join([ | ||
r' running shell command "git clone --depth 1 --branch tag_for_tests %(git_repo)s test123"', | ||
r" \(in .*/tmp.*\)", | ||
reprod_tar_cmd_pattern.format("test123"), | ||
ft.reproducible_archive_cmd("test123", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -2967,7 +2962,7 @@ def run_check(): | |
expected = '\n'.join([ | ||
r' running shell command "git clone --depth 1 --branch tag_for_tests --recursive %(git_repo)s"', | ||
r" \(in .*/tmp.*\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -2977,7 +2972,7 @@ def run_check(): | |
' running shell command "git clone --depth 1 --branch tag_for_tests --recursive' | ||
+ ' --recurse-submodules=\'!vcflib\' --recurse-submodules=\'!sdsl-lite\' %(git_repo)s"', | ||
r" \(in .*/tmp.*\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -2991,7 +2986,7 @@ def run_check(): | |
+ ' clone --depth 1 --branch tag_for_tests --recursive' | ||
+ ' --recurse-submodules=\'!vcflib\' --recurse-submodules=\'!sdsl-lite\' %(git_repo)s"', | ||
r" \(in .*/tmp.*\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -3015,7 +3010,7 @@ def run_check(): | |
r" \(in .*/tmp.*\)", | ||
r' running shell command "git checkout 8456f86 && git submodule update --init --recursive"', | ||
r" \(in testrepository\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -3026,7 +3021,7 @@ def run_check(): | |
r" \(in .*/tmp.*\)", | ||
r' running shell command "git checkout 8456f86"', | ||
r" \(in testrepository\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in .*/tmp.*\)", | ||
]) % string_args | ||
run_check() | ||
|
@@ -3038,7 +3033,7 @@ def run_check(): | |
r" \(in /.*\)", | ||
r' running shell command "git checkout 8456f86"', | ||
r" \(in /.*/testrepository\)", | ||
reprod_tar_cmd_pattern.format("testrepository"), | ||
ft.reproducible_archive_cmd("testrepository", "%(test_prefix)s/target/test.tar.gz"), | ||
r" \(in /.*\)", | ||
]) % string_args | ||
run_check() | ||
|