Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 1 | // Copyright 2017 Google Inc. All rights reserved. |
| 2 | // |
| 3 | // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 | // you may not use this file except in compliance with the License. |
| 5 | // You may obtain a copy of the License at |
| 6 | // |
| 7 | // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 | // |
| 9 | // Unless required by applicable law or agreed to in writing, software |
| 10 | // distributed under the License is distributed on an "AS IS" BASIS, |
| 11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 12 | // See the License for the specific language governing permissions and |
| 13 | // limitations under the License. |
| 14 | |
| 15 | package python |
| 16 | |
| 17 | import ( |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 18 | "fmt" |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 19 | "os" |
| 20 | "path/filepath" |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 21 | "regexp" |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 22 | "testing" |
| 23 | |
| 24 | "android/soong/android" |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 25 | ) |
| 26 | |
Nan Zhang | d4e641b | 2017-07-12 12:55:28 -0700 | [diff] [blame] | 27 | type pyModule struct { |
Nan Zhang | 1db8540 | 2017-12-18 13:20:23 -0800 | [diff] [blame] | 28 | name string |
| 29 | actualVersion string |
| 30 | pyRunfiles []string |
| 31 | srcsZip string |
| 32 | depsSrcsZips []string |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 33 | } |
| 34 | |
| 35 | var ( |
| 36 | buildNamePrefix = "soong_python_test" |
| 37 | moduleVariantErrTemplate = "%s: module %q variant %q: " |
| 38 | pkgPathErrTemplate = moduleVariantErrTemplate + |
Nan Zhang | d4e641b | 2017-07-12 12:55:28 -0700 | [diff] [blame] | 39 | "pkg_path: %q must be a relative path contained in par file." |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 40 | badIdentifierErrTemplate = moduleVariantErrTemplate + |
Liz Kammer | d737d02 | 2020-11-16 15:42:51 -0800 | [diff] [blame] | 41 | "srcs: the path %q contains invalid subpath %q." |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 42 | dupRunfileErrTemplate = moduleVariantErrTemplate + |
Nan Zhang | bea0975 | 2018-05-31 12:49:33 -0700 | [diff] [blame] | 43 | "found two files to be placed at the same location within zip %q." + |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 44 | " First file: in module %s at path %q." + |
| 45 | " Second file: in module %s at path %q." |
| 46 | noSrcFileErr = moduleVariantErrTemplate + "doesn't have any source files!" |
Nan Zhang | b8fa197 | 2017-12-22 16:12:00 -0800 | [diff] [blame] | 47 | badSrcFileExtErr = moduleVariantErrTemplate + "srcs: found non (.py|.proto) file: %q!" |
| 48 | badDataFileExtErr = moduleVariantErrTemplate + "data: found (.py|.proto) file: %q!" |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 49 | bpFile = "Android.bp" |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 50 | |
| 51 | data = []struct { |
| 52 | desc string |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 53 | mockFiles android.MockFS |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 54 | |
| 55 | errors []string |
Nan Zhang | d4e641b | 2017-07-12 12:55:28 -0700 | [diff] [blame] | 56 | expectedBinaries []pyModule |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 57 | }{ |
| 58 | { |
| 59 | desc: "module without any src files", |
| 60 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 61 | filepath.Join("dir", bpFile): []byte( |
| 62 | `python_library_host { |
| 63 | name: "lib1", |
| 64 | }`, |
| 65 | ), |
| 66 | }, |
| 67 | errors: []string{ |
| 68 | fmt.Sprintf(noSrcFileErr, |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 69 | "dir/Android.bp:1:1", "lib1", "PY3"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 70 | }, |
| 71 | }, |
| 72 | { |
| 73 | desc: "module with bad src file ext", |
| 74 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 75 | filepath.Join("dir", bpFile): []byte( |
| 76 | `python_library_host { |
| 77 | name: "lib1", |
| 78 | srcs: [ |
| 79 | "file1.exe", |
| 80 | ], |
| 81 | }`, |
| 82 | ), |
| 83 | "dir/file1.exe": nil, |
| 84 | }, |
| 85 | errors: []string{ |
| 86 | fmt.Sprintf(badSrcFileExtErr, |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 87 | "dir/Android.bp:3:11", "lib1", "PY3", "dir/file1.exe"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 88 | }, |
| 89 | }, |
| 90 | { |
| 91 | desc: "module with bad data file ext", |
| 92 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 93 | filepath.Join("dir", bpFile): []byte( |
| 94 | `python_library_host { |
| 95 | name: "lib1", |
| 96 | srcs: [ |
| 97 | "file1.py", |
| 98 | ], |
| 99 | data: [ |
| 100 | "file2.py", |
| 101 | ], |
| 102 | }`, |
| 103 | ), |
| 104 | "dir/file1.py": nil, |
| 105 | "dir/file2.py": nil, |
| 106 | }, |
| 107 | errors: []string{ |
| 108 | fmt.Sprintf(badDataFileExtErr, |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 109 | "dir/Android.bp:6:11", "lib1", "PY3", "dir/file2.py"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 110 | }, |
| 111 | }, |
| 112 | { |
| 113 | desc: "module with bad pkg_path format", |
| 114 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 115 | filepath.Join("dir", bpFile): []byte( |
| 116 | `python_library_host { |
| 117 | name: "lib1", |
| 118 | pkg_path: "a/c/../../", |
| 119 | srcs: [ |
| 120 | "file1.py", |
| 121 | ], |
| 122 | } |
| 123 | |
| 124 | python_library_host { |
| 125 | name: "lib2", |
| 126 | pkg_path: "a/c/../../../", |
| 127 | srcs: [ |
| 128 | "file1.py", |
| 129 | ], |
| 130 | } |
| 131 | |
| 132 | python_library_host { |
| 133 | name: "lib3", |
| 134 | pkg_path: "/a/c/../../", |
| 135 | srcs: [ |
| 136 | "file1.py", |
| 137 | ], |
| 138 | }`, |
| 139 | ), |
| 140 | "dir/file1.py": nil, |
| 141 | }, |
| 142 | errors: []string{ |
| 143 | fmt.Sprintf(pkgPathErrTemplate, |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 144 | "dir/Android.bp:11:15", "lib2", "PY3", "a/c/../../../"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 145 | fmt.Sprintf(pkgPathErrTemplate, |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 146 | "dir/Android.bp:19:15", "lib3", "PY3", "/a/c/../../"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 147 | }, |
| 148 | }, |
| 149 | { |
| 150 | desc: "module with bad runfile src path format", |
| 151 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 152 | filepath.Join("dir", bpFile): []byte( |
| 153 | `python_library_host { |
| 154 | name: "lib1", |
| 155 | pkg_path: "a/b/c/", |
| 156 | srcs: [ |
| 157 | ".file1.py", |
| 158 | "123/file1.py", |
| 159 | "-e/f/file1.py", |
| 160 | ], |
| 161 | }`, |
| 162 | ), |
| 163 | "dir/.file1.py": nil, |
| 164 | "dir/123/file1.py": nil, |
| 165 | "dir/-e/f/file1.py": nil, |
| 166 | }, |
| 167 | errors: []string{ |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 168 | fmt.Sprintf(badIdentifierErrTemplate, "dir/Android.bp:4:11", |
Nan Zhang | bea0975 | 2018-05-31 12:49:33 -0700 | [diff] [blame] | 169 | "lib1", "PY3", "a/b/c/-e/f/file1.py", "-e"), |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 170 | fmt.Sprintf(badIdentifierErrTemplate, "dir/Android.bp:4:11", |
Nan Zhang | bea0975 | 2018-05-31 12:49:33 -0700 | [diff] [blame] | 171 | "lib1", "PY3", "a/b/c/.file1.py", ".file1"), |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 172 | fmt.Sprintf(badIdentifierErrTemplate, "dir/Android.bp:4:11", |
Nan Zhang | bea0975 | 2018-05-31 12:49:33 -0700 | [diff] [blame] | 173 | "lib1", "PY3", "a/b/c/123/file1.py", "123"), |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 174 | }, |
| 175 | }, |
| 176 | { |
| 177 | desc: "module with duplicate runfile path", |
| 178 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 179 | filepath.Join("dir", bpFile): []byte( |
| 180 | `python_library_host { |
| 181 | name: "lib1", |
| 182 | pkg_path: "a/b/", |
| 183 | srcs: [ |
| 184 | "c/file1.py", |
| 185 | ], |
| 186 | } |
| 187 | |
| 188 | python_library_host { |
| 189 | name: "lib2", |
| 190 | pkg_path: "a/b/c/", |
| 191 | srcs: [ |
| 192 | "file1.py", |
| 193 | ], |
| 194 | libs: [ |
| 195 | "lib1", |
| 196 | ], |
| 197 | } |
Paul Duffin | c60dd80 | 2021-03-17 23:01:06 +0000 | [diff] [blame] | 198 | |
| 199 | python_binary_host { |
| 200 | name: "bin", |
| 201 | pkg_path: "e/", |
| 202 | srcs: [ |
| 203 | "bin.py", |
| 204 | ], |
| 205 | libs: [ |
| 206 | "lib2", |
| 207 | ], |
| 208 | } |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 209 | `, |
| 210 | ), |
| 211 | "dir/c/file1.py": nil, |
| 212 | "dir/file1.py": nil, |
Paul Duffin | c60dd80 | 2021-03-17 23:01:06 +0000 | [diff] [blame] | 213 | "dir/bin.py": nil, |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 214 | }, |
| 215 | errors: []string{ |
Paul Duffin | c60dd80 | 2021-03-17 23:01:06 +0000 | [diff] [blame] | 216 | fmt.Sprintf(dupRunfileErrTemplate, "dir/Android.bp:20:6", |
| 217 | "bin", "PY3", "a/b/c/file1.py", "bin", "dir/file1.py", |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 218 | "lib1", "dir/c/file1.py"), |
| 219 | }, |
| 220 | }, |
| 221 | { |
| 222 | desc: "module for testing dependencies", |
| 223 | mockFiles: map[string][]byte{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 224 | filepath.Join("dir", bpFile): []byte( |
Nan Zhang | a3fc4ba | 2017-07-20 17:43:37 -0700 | [diff] [blame] | 225 | `python_defaults { |
| 226 | name: "default_lib", |
| 227 | srcs: [ |
| 228 | "default.py", |
| 229 | ], |
| 230 | version: { |
| 231 | py2: { |
| 232 | enabled: true, |
| 233 | srcs: [ |
| 234 | "default_py2.py", |
| 235 | ], |
| 236 | }, |
| 237 | py3: { |
| 238 | enabled: false, |
| 239 | srcs: [ |
| 240 | "default_py3.py", |
| 241 | ], |
| 242 | }, |
| 243 | }, |
| 244 | } |
| 245 | |
| 246 | python_library_host { |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 247 | name: "lib5", |
| 248 | pkg_path: "a/b/", |
| 249 | srcs: [ |
| 250 | "file1.py", |
| 251 | ], |
| 252 | version: { |
| 253 | py2: { |
| 254 | enabled: true, |
| 255 | }, |
| 256 | py3: { |
| 257 | enabled: true, |
| 258 | }, |
| 259 | }, |
| 260 | } |
| 261 | |
| 262 | python_library_host { |
| 263 | name: "lib6", |
| 264 | pkg_path: "c/d/", |
| 265 | srcs: [ |
| 266 | "file2.py", |
| 267 | ], |
| 268 | libs: [ |
| 269 | "lib5", |
| 270 | ], |
| 271 | } |
| 272 | |
| 273 | python_binary_host { |
| 274 | name: "bin", |
Nan Zhang | a3fc4ba | 2017-07-20 17:43:37 -0700 | [diff] [blame] | 275 | defaults: ["default_lib"], |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 276 | pkg_path: "e/", |
| 277 | srcs: [ |
| 278 | "bin.py", |
| 279 | ], |
| 280 | libs: [ |
| 281 | "lib5", |
| 282 | ], |
| 283 | version: { |
| 284 | py3: { |
| 285 | enabled: true, |
| 286 | srcs: [ |
| 287 | "file4.py", |
| 288 | ], |
| 289 | libs: [ |
| 290 | "lib6", |
| 291 | ], |
| 292 | }, |
| 293 | }, |
| 294 | }`, |
| 295 | ), |
Nan Zhang | a3fc4ba | 2017-07-20 17:43:37 -0700 | [diff] [blame] | 296 | filepath.Join("dir", "default.py"): nil, |
| 297 | filepath.Join("dir", "default_py2.py"): nil, |
| 298 | filepath.Join("dir", "default_py3.py"): nil, |
| 299 | filepath.Join("dir", "file1.py"): nil, |
| 300 | filepath.Join("dir", "file2.py"): nil, |
| 301 | filepath.Join("dir", "bin.py"): nil, |
| 302 | filepath.Join("dir", "file4.py"): nil, |
Liz Kammer | dd849a8 | 2020-06-12 16:38:45 -0700 | [diff] [blame] | 303 | StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%' |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 304 | MAIN_FILE = '%main%'`), |
| 305 | }, |
Nan Zhang | d4e641b | 2017-07-12 12:55:28 -0700 | [diff] [blame] | 306 | expectedBinaries: []pyModule{ |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 307 | { |
| 308 | name: "bin", |
| 309 | actualVersion: "PY3", |
| 310 | pyRunfiles: []string{ |
Nan Zhang | bea0975 | 2018-05-31 12:49:33 -0700 | [diff] [blame] | 311 | "e/default.py", |
| 312 | "e/bin.py", |
| 313 | "e/default_py3.py", |
| 314 | "e/file4.py", |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 315 | }, |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 316 | srcsZip: "out/soong/.intermediates/dir/bin/PY3/bin.py.srcszip", |
Nan Zhang | 1db8540 | 2017-12-18 13:20:23 -0800 | [diff] [blame] | 317 | depsSrcsZips: []string{ |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 318 | "out/soong/.intermediates/dir/lib5/PY3/lib5.py.srcszip", |
| 319 | "out/soong/.intermediates/dir/lib6/PY3/lib6.py.srcszip", |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 320 | }, |
| 321 | }, |
| 322 | }, |
| 323 | }, |
| 324 | } |
| 325 | ) |
| 326 | |
| 327 | func TestPythonModule(t *testing.T) { |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 328 | for _, d := range data { |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 329 | if d.desc != "module with duplicate runfile path" { |
| 330 | continue |
| 331 | } |
| 332 | errorPatterns := make([]string, len(d.errors)) |
| 333 | for i, s := range d.errors { |
| 334 | errorPatterns[i] = regexp.QuoteMeta(s) |
| 335 | } |
| 336 | |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 337 | t.Run(d.desc, func(t *testing.T) { |
Paul Duffin | 89648f9 | 2021-03-20 00:36:55 +0000 | [diff] [blame] | 338 | result := android.GroupFixturePreparers( |
| 339 | android.PrepareForTestWithDefaults, |
| 340 | PrepareForTestWithPythonBuildComponents, |
| 341 | d.mockFiles.AddToFixture(), |
| 342 | ).ExtendWithErrorHandler(android.FixtureExpectsAllErrorsToMatchAPattern(errorPatterns)). |
| 343 | RunTest(t) |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 344 | |
| 345 | if len(result.Errs) > 0 { |
| 346 | return |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 347 | } |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 348 | |
| 349 | for _, e := range d.expectedBinaries { |
| 350 | t.Run(e.name, func(t *testing.T) { |
| 351 | expectModule(t, result.TestContext, e.name, e.actualVersion, e.srcsZip, e.pyRunfiles, e.depsSrcsZips) |
| 352 | }) |
| 353 | } |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 354 | }) |
| 355 | } |
| 356 | } |
| 357 | |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 358 | func expectModule(t *testing.T, ctx *android.TestContext, name, variant, expectedSrcsZip string, expectedPyRunfiles, expectedDepsSrcsZips []string) { |
Colin Cross | cec8171 | 2017-07-13 14:43:27 -0700 | [diff] [blame] | 359 | module := ctx.ModuleForTests(name, variant) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 360 | |
Nan Zhang | d4e641b | 2017-07-12 12:55:28 -0700 | [diff] [blame] | 361 | base, baseOk := module.Module().(*Module) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 362 | if !baseOk { |
| 363 | t.Fatalf("%s is not Python module!", name) |
| 364 | } |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 365 | |
Nan Zhang | 1db8540 | 2017-12-18 13:20:23 -0800 | [diff] [blame] | 366 | actualPyRunfiles := []string{} |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 367 | for _, path := range base.srcsPathMappings { |
Nan Zhang | 1db8540 | 2017-12-18 13:20:23 -0800 | [diff] [blame] | 368 | actualPyRunfiles = append(actualPyRunfiles, path.dest) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 369 | } |
| 370 | |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 371 | android.AssertDeepEquals(t, "pyRunfiles", expectedPyRunfiles, actualPyRunfiles) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 372 | |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 373 | android.AssertPathRelativeToTopEquals(t, "srcsZip", expectedSrcsZip, base.srcsZip) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 374 | |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 375 | android.AssertPathsRelativeToTopEquals(t, "depsSrcsZips", expectedDepsSrcsZips, base.depsSrcsZips) |
Nan Zhang | db0b9a3 | 2017-02-27 10:12:13 -0800 | [diff] [blame] | 376 | } |
| 377 | |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 378 | func TestMain(m *testing.M) { |
Paul Duffin | 803876aa | 2021-03-17 22:38:23 +0000 | [diff] [blame] | 379 | os.Exit(m.Run()) |
Colin Cross | 98be1bb | 2019-12-13 20:41:13 -0800 | [diff] [blame] | 380 | } |