Fix cc-with-index make check flags

This commit is contained in:
Sergio Durigan Junior 2019-05-03 16:54:35 -04:00
parent ba4a0e1ae8
commit dcce6be98d

View file

@ -1212,8 +1212,7 @@ class RunTestGDBNativeExtendedGDBServer_c32t32 (BuildAndTestGDBFactory):
class RunTestGDBIndexBuild (BuildAndTestGDBFactory): class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
"""Testing with the "cc-with-tweaks.sh" passing -i.""" """Testing with the "cc-with-tweaks.sh" passing -i."""
def __init__ (self, **kwargs): def __init__ (self, **kwargs):
self.extra_make_check_flags = [ util.Interpolate ('CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc'), self.extra_make_check_flags = [ util.Interpolate ('RUNTESTFLAGS="CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc" "CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++"') ]
util.Interpolate ('CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++') ]
BuildAndTestGDBFactory.__init__ (self, **kwargs) BuildAndTestGDBFactory.__init__ (self, **kwargs)
class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory): class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
@ -1221,9 +1220,7 @@ class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
def __init__ (self, **kwargs): def __init__ (self, **kwargs):
self.extra_CFLAGS = [ '-m32' ] self.extra_CFLAGS = [ '-m32' ]
self.extra_CXXFLAGS = self.extra_CFLAGS self.extra_CXXFLAGS = self.extra_CFLAGS
self.extra_make_check_flags = [ util.Interpolate ('CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc'), self.extra_make_check_flags = [ util.Interpolate ('RUNTESTFLAGS="CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc" "CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++" --target_board unix/-m32') ]
util.Interpolate ('CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++'),
'RUNTESTFLAGS=--target_board unix/-m32' ]
BuildAndTestGDBFactory.__init__ (self, **kwargs) BuildAndTestGDBFactory.__init__ (self, **kwargs)
# Class for only building GDB, without testing # Class for only building GDB, without testing