- $command =~ s/\${srcdir:=.}/$srcdir/g;
- $command =~ s/\${bindir:=.}/$bindir/g;
- $command =~ s/\${EXEEXT:=}//g;
- $command =~ s/\$SG_TEST_EXENV //g;
- $command =~ s/\$SG_TEST_ENV //g;
- $command =~ s/\$SG_EXENV_TEST //g;
- $command =~ s/\$EXEEXT//g;
- $command =~ s/\${EXEEXT}//g;
- $command =~ s/\${srcdir}/\${CMAKE_HOME_DIRECTORY}\/src/g;
- $command =~ s/ \$ARGS//g;
- $command =~ s/ \$@ //g;
- $command =~ s/..\/..\/bin\/smpirun/\${CMAKE_BINARY_DIR\}\/bin\/smpirun/g;
+ $command = var_subst($command, "srcdir", $srcdir);
+ $command = var_subst($command, "bindir", $bindir);
+ $command = var_subst($command, "EXEEXT", "");
+ $command = var_subst($command, "SG_TEST_EXENV", "");
+ $command = var_subst($command, "SG_TEST_ENV", "");
+ $command = var_subst($command, "SG_EXENV_TEST", "");
+ $command = var_subst($command, "ARGS", "");
+ $command =~ s/\$@//g;
+# $command =~ s/..\/..\/bin\/smpirun/\${CMAKE_BINARY_DIR\}\/bin\/smpirun/g;
+ $command =~ s/^\s+//;
+ $command =~ s/^[^\/\$]\S*\//$path\/$&/;
+ $command =~ s/^(\S*\/)(?:\.\/)+/$1/g;