Merge remote-tracking branch 'origin/10' into snapshot

This commit is contained in:
Sylvestre Ledru 2020-07-03 11:58:05 +02:00
commit 1e6b695748

6
debian/orig-tar.sh vendored
View File

@ -36,7 +36,7 @@ GIT_BASE_URL=https://github.com/llvm/llvm-project
GIT_TOOLCHAIN_CHECK=https://github.com/opencollab/llvm-toolchain-integration-test-suite.git GIT_TOOLCHAIN_CHECK=https://github.com/opencollab/llvm-toolchain-integration-test-suite.git
reset-repo () reset_repo ()
{ {
cd $1 cd $1
git clean -qfd git clean -qfd
@ -104,7 +104,7 @@ cd git-archive
if test -d $EXPORT_PATH/llvm-project; then if test -d $EXPORT_PATH/llvm-project; then
echo "Updating repo in $EXPORT_PATH/llvm-project" echo "Updating repo in $EXPORT_PATH/llvm-project"
# Update it # Update it
reset-repo $EXPORT_PATH/llvm-project reset_repo $EXPORT_PATH/llvm-project
else else
# Download it # Download it
echo "Cloning the repo in $EXPORT_PATH/llvm-project" echo "Cloning the repo in $EXPORT_PATH/llvm-project"
@ -114,7 +114,7 @@ fi
if test -d $EXPORT_PATH/llvm-toolchain-integration-test-suite; then if test -d $EXPORT_PATH/llvm-toolchain-integration-test-suite; then
echo "Updating repo in $EXPORT_PATH/llvm-toolchain-integration-test-suite" echo "Updating repo in $EXPORT_PATH/llvm-toolchain-integration-test-suite"
# Update it # Update it
reset-repo $EXPORT_PATH/llvm-toolchain-integration-test-suite reset_repo $EXPORT_PATH/llvm-toolchain-integration-test-suite
else else
echo "Clone llvm-toolchain-integration-test-suite into $EXPORT_PATH/llvm-toolchain-integration-test-suite" echo "Clone llvm-toolchain-integration-test-suite into $EXPORT_PATH/llvm-toolchain-integration-test-suite"
git clone $GIT_TOOLCHAIN_CHECK $EXPORT_PATH/llvm-toolchain-integration-test-suite git clone $GIT_TOOLCHAIN_CHECK $EXPORT_PATH/llvm-toolchain-integration-test-suite