Skip to content

Commit

Permalink
Fix host_release tests for prebuilt Dart SDK (flutter#27284)
Browse files Browse the repository at this point in the history
  • Loading branch information
zanderso authored Jul 9, 2021
1 parent c373f70 commit edf9d9b
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions testing/run_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ def RunEngineExecutable(build_dir, executable_name, filter, flags=[],
# stack traces on Linux.
executable = unstripped_exe
# Some tests depend on the EGL/GLES libraries placed in the build directory.
env = {'LD_LIBRARY_PATH': os.path.join(build_dir, 'lib.unstripped')}
env = os.environ.copy()
env['LD_LIBRARY_PATH'] = os.path.join(build_dir, 'lib.unstripped')
else:
executable = FindExecutablePath(os.path.join(build_dir, executable_name))
env = None
Expand Down Expand Up @@ -220,7 +221,7 @@ def RunEngineBenchmarks(build_dir, filter):
def SnapshotTest(build_dir, test_packages, dart_file, kernel_file_output, verbose_dart_snapshot):
print("Generating snapshot for test %s" % dart_file)

dart = os.path.join(build_dir, 'dart-sdk', 'bin', 'dart')
dart = os.path.join(build_dir, 'dart')
frontend_server = os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot')
flutter_patched_sdk = os.path.join(build_dir, 'flutter_patched_sdk')

Expand Down Expand Up @@ -451,7 +452,7 @@ def RunFrontEndServerTests(build_dir):
os.path.join(build_dir, 'flutter_patched_sdk')]
RunEngineExecutable(
build_dir,
os.path.join('dart-sdk', 'bin', 'dart'),
'dart',
None,
flags=opts,
cwd=test_dir)
Expand All @@ -464,7 +465,7 @@ def RunConstFinderTests(build_dir):
os.path.join(test_dir, 'const_finder_test.dart'),
os.path.join(build_dir, 'gen', 'frontend_server.dart.snapshot'),
os.path.join(build_dir, 'flutter_patched_sdk')]
RunEngineExecutable(build_dir, os.path.join('dart-sdk', 'bin', 'dart'), None, flags=opts, cwd=test_dir)
RunEngineExecutable(build_dir, 'dart', None, flags=opts, cwd=test_dir)


def RunLitetestTests(build_dir):
Expand All @@ -476,7 +477,7 @@ def RunLitetestTests(build_dir):
dart_test_file]
RunEngineExecutable(
build_dir,
os.path.join('dart-sdk', 'bin', 'dart'),
'dart',
None,
flags=opts,
cwd=test_dir)
Expand All @@ -491,7 +492,7 @@ def RunBenchmarkTests(build_dir):
dart_test_file]
RunEngineExecutable(
build_dir,
os.path.join('dart-sdk', 'bin', 'dart'),
'dart',
None,
flags=opts,
cwd=test_dir)
Expand All @@ -506,7 +507,7 @@ def RunGithooksTests(build_dir):
dart_test_file]
RunEngineExecutable(
build_dir,
os.path.join('dart-sdk', 'bin', 'dart'),
'dart',
None,
flags=opts,
cwd=test_dir)
Expand All @@ -523,7 +524,7 @@ def RunClangTidyTests(build_dir):
os.path.join(buildroot_dir, 'flutter')]
RunEngineExecutable(
build_dir,
os.path.join('dart-sdk', 'bin', 'dart'),
'dart',
None,
flags=opts,
cwd=test_dir)
Expand Down

0 comments on commit edf9d9b

Please sign in to comment.