Add QEMU_LD_PREFIX environment variables so tests that spawn new processes also get the library path setup correctly.

Change-Id: I1232925b037f897ff1fa38503cbe4e32d07cb388
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/435661
Commit-Queue: Siva Annamalai <[email protected]>
Reviewed-by: Ryan Macnak <[email protected]>

Author: a-siva

pkg/test_runner/lib/src/compiler_configuration.dart

@@ -1251,8 +1251,10 @@ class AppJitCompilerConfiguration extends CompilerConfiguration {
     if (_configuration.useQemu) {
       final config = QemuConfig.all[_configuration.architecture]!;
       arguments.insert(0, executable);
-      arguments.insertAll(0, config.arguments);
       executable = config.executable;
+      if (environmentOverrides['QEMU_LD_PREFIX'] == null) {
+        environmentOverrides['QEMU_LD_PREFIX'] = config.elfInterpreterPrefix;
+      }
     }
     var command = CompilationCommand('app_jit', tempDir,
         bootstrapDependencies(), executable, arguments, environmentOverrides,

pkg/test_runner/lib/src/runtime_configuration.dart

@@ -297,29 +297,29 @@ class JsshellRuntimeConfiguration extends CommandLineJavaScriptRuntime {
 class QemuConfig {
   static const all = <Architecture, QemuConfig>{
     Architecture.ia32:
-        QemuConfig('qemu-i386', ['-L', '/usr/lib/i386-linux-gnu/']),
+        QemuConfig('qemu-i386', '/usr/lib/i386-linux-gnu/'),
     Architecture.x64:
-        QemuConfig('qemu-x86_64', ['-L', '/usr/lib/x86_64-linux-gnu/']),
+        QemuConfig('qemu-x86_64', '/usr/lib/x86_64-linux-gnu/'),
     Architecture.x64c:
-        QemuConfig('qemu-x86_64', ['-L', '/usr/lib/x86_64-linux-gnu/']),
+        QemuConfig('qemu-x86_64', '/usr/lib/x86_64-linux-gnu/'),
     Architecture.arm:
-        QemuConfig('qemu-arm', ['-L', '/usr/arm-linux-gnueabihf/']),
+        QemuConfig('qemu-arm', '/usr/arm-linux-gnueabihf/'),
     Architecture.arm64:
-        QemuConfig('qemu-aarch64', ['-L', '/usr/aarch64-linux-gnu/']),
+        QemuConfig('qemu-aarch64', '/usr/aarch64-linux-gnu/'),
     Architecture.simarm64_arm64:
-        QemuConfig('qemu-aarch64', ['-L', '/usr/aarch64-linux-gnu/']),
+        QemuConfig('qemu-aarch64', '/usr/aarch64-linux-gnu/'),
     Architecture.arm64c:
-        QemuConfig('qemu-aarch64', ['-L', '/usr/aarch64-linux-gnu/']),
+        QemuConfig('qemu-aarch64', '/usr/aarch64-linux-gnu/'),
     Architecture.riscv32:
-        QemuConfig('qemu-riscv32', ['-L', '/usr/riscv32-linux-gnu/']),
+        QemuConfig('qemu-riscv32', '/usr/riscv32-linux-gnu/'),
     Architecture.riscv64:
-        QemuConfig('qemu-riscv64', ['-L', '/usr/riscv64-linux-gnu/']),
+        QemuConfig('qemu-riscv64', '/usr/riscv64-linux-gnu/'),
   };
 
   final String executable;
-  final List<String> arguments;
+  final String elfInterpreterPrefix;
 
-  const QemuConfig(this.executable, this.arguments);
+  const QemuConfig(this.executable, this.elfInterpreterPrefix);
 }
 
 /// Common runtime configuration for runtimes based on the Dart VM.
@@ -408,8 +408,10 @@ class StandaloneDartRuntimeConfiguration extends DartVmRuntimeConfiguration {
     if (_configuration.useQemu) {
       final config = QemuConfig.all[_configuration.architecture]!;
       arguments.insert(0, executable);
-      arguments.insertAll(0, config.arguments);
       executable = config.executable;
+      if (environmentOverrides['QEMU_LD_PREFIX'] == null) {
+        environmentOverrides['QEMU_LD_PREFIX'] = config.elfInterpreterPrefix;
+      }
     }
     var command = VMCommand(executable, arguments, environmentOverrides);
     if (_configuration.rr && !isCrashExpected) {
@@ -443,8 +445,10 @@ class DartPrecompiledRuntimeConfiguration extends DartVmRuntimeConfiguration {
     if (_configuration.useQemu) {
       final config = QemuConfig.all[_configuration.architecture]!;
       arguments.insert(0, executable);
-      arguments.insertAll(0, config.arguments);
       executable = config.executable;
+      if (environmentOverrides['QEMU_LD_PREFIX'] == null) {
+        environmentOverrides['QEMU_LD_PREFIX'] = config.elfInterpreterPrefix;
+      }
     }
 
     var command = VMCommand(executable, arguments, environmentOverrides);

pkg/test_runner/lib/src/test_suite.dart

@@ -71,6 +71,10 @@ abstract class TestSuite {
           if (configuration.firefoxPath != null)
             'FIREFOX_PATH':
                 Uri.base.resolve(configuration.firefoxPath!).toFilePath(),
+          if (configuration.useQemu)
+            'QEMU_LD_PREFIX':
+                QemuConfig.all[configuration.architecture]!
+                .elfInterpreterPrefix,
         };
 
   Map<String, String> get environmentOverrides => _environmentOverrides;
@@ -291,9 +295,9 @@ class VMTestSuite extends TestSuite {
     if (configuration.useQemu) {
       final config = QemuConfig.all[configuration.architecture]!;
       initialHostArguments.insert(0, hostRunnerPath);
-      initialHostArguments.insertAll(0, config.arguments);
+      initialHostArguments.insertAll(0, ['-L', config.elfInterpreterPrefix]);
       initialTargetArguments.insert(0, targetRunnerPath);
-      initialTargetArguments.insertAll(0, config.arguments);
+      initialTargetArguments.insertAll(0, ['-L', config.elfInterpreterPrefix]);
       hostRunnerPath = config.executable;
       targetRunnerPath = config.executable;
     }