diff --git a/debian/changelog b/debian/changelog index 13caf3b0..3c2104db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-13 (1:13~++20210720093711+b2e25572d2a7-1~exp1) experimental; urgency=medium +llvm-toolchain-13 (1:13~++20210731010128+6eaf46beb462-1~exp1) experimental; urgency=medium * Branching of snapshot into 13 * Adjust libclang: diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index a08f5fbd..85f4828f 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -813,9 +813,15 @@ if ! grep "No such file or directory" foo.log; then # This isn't failing on 64, so, look at the results if ! ./a.out 2>&1 | grep -q -E "(Test unit written|PreferSmall)"; then echo "fuzzer. Output:" +<<<<<<< Updated upstream ./a.out || true if [ $DEB_HOST_ARCH == "amd64" -o $DEB_HOST_ARCH == "i386" ]; then # Don't fail on arm64 and ppc64el +======= + ./a.out + if [ $DEB_HOST_ARCH != "arm64" ]; then + # Don't fail on arm64 +>>>>>>> Stashed changes exit 42 fi fi