Cutover to hardened toolchain by default (3 of 3). BUG=3981 TEST=unit,autotest

client/site_tests/hardware_SAT/hardware_SAT.py

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging, os, re
 
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 class hardware_SAT(test.test):
     version = 1
 
-    def target_is_x86(self):
+    def target_is_x86_pie(self):
         result = utils.system_output('${CC} -dumpmachine', retain_output=True,
                                      ignore_status=True)
         x86_pattern = re.compile(r"^i.86.*")
-        return x86_pattern.match(result)
+        if not x86_pattern.match(result):
+          return False
+        result = utils.system_output('${CC} -dumpspecs', retain_output=True,
+                                     ignore_status=True)
+        if result.find('!nopie:') == -1:
+          return False
+        return True
 
 
     # http://code.google.com/p/stressapptest/ 
     def setup(self, tarball='stressapptest-1.0.3_autoconf.tar.gz'):
         # clean
         if os.path.exists(self.srcdir):
             utils.system('rm -rf %s' % self.srcdir)
 
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
 
         self.job.setup_dep(['libaio'])
         ldflags = '-L' + self.autodir + '/deps/libaio/lib'
         cflags = '-I' + self.autodir + '/deps/libaio/include'
         # Add paths to libaio files.
         var_flags = 'LDFLAGS="' + ldflags + '"'
-        # TODO(fes): Remove this if there is a better way to detect that we are
-        # in a hardened build (or if this later properly picks up the -nopie
-        # flag from portage)
-        if os.path.exists('/etc/hardened') and self.target_is_x86():
+        if self.target_is_x86_pie():
             var_flags += ' CXXFLAGS="-nopie ' + cflags + '"'
             var_flags += ' CFLAGS="-nopie ' + cflags + '"'
         else:
             var_flags += ' CXXFLAGS="' + cflags + '"'
             var_flags += ' CFLAGS="' + cflags + '"'
         var_flags += ' LIBS="-static -laio"'
 
         os.chdir(self.srcdir)
         # ./configure stores relevant path and environment variables.
         utils.configure(configure=var_flags + ' ./configure')
@@ skipping 28 matching lines @@
         # or disk cache problems. Two threads ensure multiple
         # outstanding transactions to the disk, if supported.
         args += ' -f sat.diskthread.a'  # disk thread
         args += ' -f sat.diskthread.b'
 
         os.chdir(os.path.join(self.srcdir, 'src'))
         sat = utils.run('./stressapptest' + args)
         logging.debug(sat.stdout)
         if not re.search('Status: PASS', sat.stdout):
             raise error.TestFail(sat.stdout)