From 7675bc2d79187b9ddea79d29ec2b7fa2fc2eab79 Mon Sep 17 00:00:00 2001
From: Richard Tucker <rit@harlequin.com>
Date: Wed, 12 Nov 1997 16:34:40 +0000
Subject: [PATCH] Change include tree

Copied from Perforce
 Change: 18974
 ServerID: perforce.ravenbrook.com
---
 mps/qa/test/script/commands/clib  |  4 +---
 mps/qa/test/script/commands/index |  2 +-
 mps/qa/test/script/commands/try   | 10 +++-------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/mps/qa/test/script/commands/clib b/mps/qa/test/script/commands/clib
index a375af67998..9fddf6bb29f 100644
--- a/mps/qa/test/script/commands/clib
+++ b/mps/qa/test/script/commands/clib
@@ -10,12 +10,10 @@
  "PLATFORM"
 );
 
-require "dirs";
+require "require";
 
 print "Compiling test libraries from $testlib_dir.\n";
 
-require "compile";
-
 open(MANIFEST, "$testlib_dir/manifest");
 
 while ($tlfile = <MANIFEST>) {
diff --git a/mps/qa/test/script/commands/index b/mps/qa/test/script/commands/index
index 4f75bfa227c..1dab7a8b41f 100644
--- a/mps/qa/test/script/commands/index
+++ b/mps/qa/test/script/commands/index
@@ -6,7 +6,7 @@
 
 &options();
 
-require "headread";
+require "require";
 
 opendir(DIR, ".");
 
diff --git a/mps/qa/test/script/commands/try b/mps/qa/test/script/commands/try
index 5f11d261ddd..294292bcaa6 100644
--- a/mps/qa/test/script/commands/try
+++ b/mps/qa/test/script/commands/try
@@ -10,22 +10,18 @@
  "PLATFORM"
 );
 
-require "dirs";
-require "headread";
-require "compile";
+require "require";
 
 foreach $testfile (@qa_args) {
 
- print "Test file: $testfile.\n";
-
  &readheader($testfile, 0);
  unless ($test_header{"language"} eq "c") {
   die "Don't know how to run test in this language.\n";
  }
 
- $linkfiles = " ".$test_header{"link"};
- $linkfiles =~ s/ +/ $obj_dir\//g;
+ $linkfiles = $test_header{"link"};
  $objfile = "$obj_dir/tmp_test";
+
  unless (&compile_and_link($testfile, $objfile, $linkfiles)) {
   die "Compilation failed on test ".$testfile.".\n";
  }