Merge remote branch 'cros/upstream' into master.

client/tests/rmaptest/rmaptest.py

 import os
 from autotest_lib.client.bin import test
 from autotest_lib.client.common_lib import utils
 
 
 # tests is a simple array of "cmd" "arguments"
 tests = [["rmaptest", "-h -i100 -n100 -s100 -t100 -V10 -v file1.dat"],
          ["rmaptest", "-l -i100 -n100 -s100 -t100 -V10 -v file2.dat"],
          ["rmaptest", "-r -i100 -n100 -s100 -t100 -V10 -v file3.dat"],
         ]
 name = 0
 arglist = 1
 
 class rmaptest(test.test):
     version = 1
     preserve_srcdir = True
 
     def initialize(self):
         self.job.require_gcc()
 
 
     def setup(self):
         os.chdir(self.srcdir)
-        utils.system('gcc -Wall -o rmaptest rmap-test.c')
+        utils.system(utils.get_cc() + ' -Wall -o rmaptest rmap-test.c')
 
 
     def execute(self, args = ''):
         os.chdir(self.tmpdir)
         for test in tests:
             cmd = '%s/%s %s %s' % (self.srcdir, test[name], args, test[arglist])
             utils.system(cmd)