@@ -99,6 +99,27 @@ const BASE_SYSROOT_SUITE: &[TestCase] = &[
99
99
runner. run_out_command ( "gen_block_iterate" , & [ ] ) ;
100
100
} ) ,
101
101
TestCase :: build_bin_and_run ( "aot.raw-dylib" , "example/raw-dylib.rs" , & [ ] ) ,
102
+ TestCase :: custom ( "test.sysroot" , & |runner| {
103
+ apply_patches (
104
+ & runner. dirs ,
105
+ "sysroot_tests" ,
106
+ & runner. stdlib_source . join ( "library" ) ,
107
+ & SYSROOT_TESTS_SRC . to_path ( & runner. dirs ) ,
108
+ ) ;
109
+
110
+ SYSROOT_TESTS . clean ( & runner. dirs ) ;
111
+
112
+ if runner. is_native {
113
+ let mut test_cmd = SYSROOT_TESTS . test ( & runner. target_compiler , & runner. dirs ) ;
114
+ test_cmd. args ( [ "-p" , "coretests" , "-p" , "alloctests" , "--tests" , "--" , "-q" ] ) ;
115
+ spawn_and_wait ( test_cmd) ;
116
+ } else {
117
+ eprintln ! ( "Cross-Compiling: Not running tests" ) ;
118
+ let mut build_cmd = SYSROOT_TESTS . build ( & runner. target_compiler , & runner. dirs ) ;
119
+ build_cmd. args ( [ "-p" , "coretests" , "-p" , "alloctests" , "--tests" ] ) ;
120
+ spawn_and_wait ( build_cmd) ;
121
+ }
122
+ } ) ,
102
123
] ;
103
124
104
125
pub ( crate ) static RAND_REPO : GitRepo = GitRepo :: github (
@@ -146,27 +167,6 @@ const EXTENDED_SYSROOT_SUITE: &[TestCase] = &[
146
167
spawn_and_wait ( build_cmd) ;
147
168
}
148
169
} ) ,
149
- TestCase :: custom ( "test.sysroot" , & |runner| {
150
- apply_patches (
151
- & runner. dirs ,
152
- "sysroot_tests" ,
153
- & runner. stdlib_source . join ( "library" ) ,
154
- & SYSROOT_TESTS_SRC . to_path ( & runner. dirs ) ,
155
- ) ;
156
-
157
- SYSROOT_TESTS . clean ( & runner. dirs ) ;
158
-
159
- if runner. is_native {
160
- let mut test_cmd = SYSROOT_TESTS . test ( & runner. target_compiler , & runner. dirs ) ;
161
- test_cmd. args ( [ "-p" , "coretests" , "-p" , "alloctests" , "--" , "-q" ] ) ;
162
- spawn_and_wait ( test_cmd) ;
163
- } else {
164
- eprintln ! ( "Cross-Compiling: Not running tests" ) ;
165
- let mut build_cmd = SYSROOT_TESTS . build ( & runner. target_compiler , & runner. dirs ) ;
166
- build_cmd. args ( [ "-p" , "coretests" , "-p" , "alloctests" , "--tests" ] ) ;
167
- spawn_and_wait ( build_cmd) ;
168
- }
169
- } ) ,
170
170
TestCase :: custom ( "test.regex" , & |runner| {
171
171
REGEX_REPO . patch ( & runner. dirs ) ;
172
172
0 commit comments