Auto merge of #33821 - sanxiyn:cfg-test, r=nikomatsakis

Do not inject test harness for --cfg test

Fix #33670.

diff --cc src/librustc_driver/driver.rs
Simple merge

diff --cc src/libsyntax/test.rs
index 45f349eff31eabbda6a6708bea47575bef7d3ec3,6785a8690d476903d0a648152ef63092955432f5..6fbbed2ee9842befbfd1236ef1ede25c3066323a
--- 1/src/libsyntax/test.rs
--- 2/src/libsyntax/test.rs
+++ b/src/libsyntax/test.rs
@@@ -85,9 -79,9 +79,9 @@@ pub fn modify_for_testing(sess: &ParseS
                                             "reexport_test_harness_main");
  
      if should_test {
-         generate_test_harness(sess, reexport_test_harness_main, krate, cfg, span_diagnostic)
+         generate_test_harness(sess, reexport_test_harness_main, krate, span_diagnostic)
      } else {
 -        strip_test_functions(span_diagnostic, krate)
 +        strip_test_functions(krate)
      }
  }