update test backtrace test case for query system

Author: chenyukang

tests/run-make/short-ice/check.sh

@@ -8,21 +8,27 @@ full=$(cat $TMPDIR/rust-test-2.log | wc -l)
 rustc_query_count=$(cat $TMPDIR/rust-test-1.log | grep rustc_query_ | wc -l)
 rustc_query_count_full=$(cat $TMPDIR/rust-test-2.log | grep rustc_query_ | wc -l)
 
+begin_count=$(cat $TMPDIR/rust-test-2.log | grep __rust_begin_short_backtrace | wc -l)
+end_count=$(cat $TMPDIR/rust-test-2.log | grep __rust_end_short_backtrace | wc -l)
+
 cat $TMPDIR/rust-test-1.log
 echo "====================="
 cat $TMPDIR/rust-test-2.log
+echo "====================="
 
 echo "short backtrace: $short"
 echo "full  backtrace: $full"
+echo "begin_count: $begin_count"
+echo "end_count  : $end_count"
 echo "rustc_query_count: $rustc_query_count"
 echo "rustc_query_count_full: $rustc_query_count_full"
 
-## check `rustc_query_count` to avoid to missing `__rust_end_short_backtrace`
-##  1 <= $rustc_query_count < $rustc_query_count_full
-##  $rustc_query_count_full > 10
-if [ $full -gt $short ] &&
-    [ $rustc_query_count -gt 1 ] &&
-    [ $rustc_query_count -lt $rustc_query_count_full ] &&
+## backtraces to vary a bit depending on platform and configuration options,
+## here we make sure that the short backtrace of rustc_query is shorter than the full,
+## and marks are in pairs.
+if [ $short -lt $full ] &&
+    [ $begin_count -eq $end_count ] &&
+    [ $(($rustc_query_count + 10)) -lt $rustc_query_count_full ] &&
     [ $rustc_query_count_full -gt 10 ]; then
     exit 0
 else

tests/ui/panics/default-backtrace-ice.stderr

@@ -8,6 +8,8 @@ LL | fn main() { missing_ident; }
 stack backtrace:
 (end_short_backtrace)
 (begin_short_backtrace)
+(end_short_backtrace)
+(begin_short_backtrace)
 
 error: the compiler unexpectedly panicked. this is a bug.