Bug 791804: Update the AOT compilation to use the new Assert and Util classes instead of shell.as
authorBrent Baker <brbaker@adobe.com>
Mon, 01 Oct 2012 06:40:22 -0700
changeset 7557 58be71b37b16e0c96567453930a51fdc08bc2d11
parent 7556 b42acf5bc26a2b2530d33985992481ff2d4ce498
child 7558 9cdb18e9a83325ee36ea0fb7970c01c14f419d38
push id4260
push userdschaffe@adobe.com
push dateFri, 05 Oct 2012 17:33:23 +0000
bugs791804, 1119380
Bug 791804: Update the AOT compilation to use the new Assert and Util classes instead of shell.as CL@1119380
test/util/runtestBase.py
--- a/test/util/runtestBase.py
+++ b/test/util/runtestBase.py
@@ -1031,16 +1031,19 @@ class RuntestBase(object):
             extraoutname = extraoutname.replace(".abc_", "")
             extraoutname = extraoutname.replace(".abc", "")
             extraoutname = extraoutname.replace("/", ".")
             extraoutname = extraoutname+"."+outname
             extraoutabc = os.path.join(output, extraoutname + ".abc")
             self.copyfile_retry(abc, extraoutabc)
             copiedExtraAbcs.append(output+"/"+extraoutname+".abc")
 
+        for harness_abc in self.harness_abcs:
+            copiedExtraAbcs.append(output+"/"+harness_abc)
+
         cmd = '%s -Xshell -Xoutput %s %s %s %s' % (os.path.join(self.aotsdk, 'bin/adt'), output, self.aotextraargs, " ".join(copiedExtraAbcs), outabc)
         self.verbose_print(cmd)
 
         try:
             (f,err,exitcode) = self.run_pipe(cmd)
             if exitcode == 0:
                 # Deal with the fact that adt always returns 0, I have not actually seen it return
                 # anything else even when it says that it failed. So instead of relying on the exitcode
@@ -1528,16 +1531,21 @@ class RuntestBase(object):
         self.compile_test(self.abcasmShell+'.as')
         # Seems odd, but it is possible for the AOT compilation to start
         # before the abcasm helper abc files is actually written out
         if self.aotsdk:
             sleep(5)
             # Make sure that the aot output directory exists before we spawn threads to compile
             if not os.path.exists(self.aotout):
                 os.mkdir(self.aotout)
+
+            # Move the harness files into the AOT compilation directory
+            for harness_abc in self.harness_abcs:
+                self.copyfile_retry(harness_abc, self.aotout+"/"+harness_abc)
+
             # We use the test config file to mark abc files that fail to AOT compile,
             # so we need to take account of that here before we try to compile them.
             self.settings, self.directives = self.parseTestConfig(self.testconfig)
             failconfig_settings, failconfig_directives = self.parseTestConfig(self.failconfig)
             self.settings.update(failconfig_settings)
 
 
         if self.threads == 1 or platform.system()[:6].upper() == 'CYGWIN':