am aab012d6: Merge "Add --trace variants of the run-test testing rules."

* commit 'aab012d6196bd29b3167963ec8acb0b9780672b2':
  Add --trace variants of the run-test testing rules.