From 66415366111abc41c6341ea6f0e090f0bb8bfeda Mon Sep 17 00:00:00 2001 From: Jonah Williams Date: Mon, 31 Oct 2022 10:42:58 -0700 Subject: [PATCH] use shader utils for JSON test (flutter/engine#37176) --- engine/src/flutter/testing/dart/fragment_shader_test.dart | 4 ++-- engine/src/flutter/testing/run_tests.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/engine/src/flutter/testing/dart/fragment_shader_test.dart b/engine/src/flutter/testing/dart/fragment_shader_test.dart index 332a15ba690..ed12e9939ed 100644 --- a/engine/src/flutter/testing/dart/fragment_shader_test.dart +++ b/engine/src/flutter/testing/dart/fragment_shader_test.dart @@ -22,9 +22,9 @@ void main() async { }()); test('impellerc produces reasonable JSON encoded IPLR files', () async { - final String path = Platform.environment['FLUTTER_FRAGMENT_SHADER_TEST_PATH']!; + final Directory directory = shaderDirectory('iplr-json'); final Object? rawData = convert.json.decode( - File('$path/gen/flutter/lib/ui/fixtures/shaders/iplr-json/ink_sparkle.frag.iplr').readAsStringSync()); + File(path.join(directory.path, 'ink_sparkle.frag.iplr')).readAsStringSync()); expect(rawData is Map, true); diff --git a/engine/src/flutter/testing/run_tests.py b/engine/src/flutter/testing/run_tests.py index 8e19e8f8823..23553c156ed 100755 --- a/engine/src/flutter/testing/run_tests.py +++ b/engine/src/flutter/testing/run_tests.py @@ -536,7 +536,6 @@ def GatherDartTest( command_args, forbidden_output=forbidden_output, expect_failure=expect_failure, - extra_env={'FLUTTER_FRAGMENT_SHADER_TEST_PATH': build_dir}, )