Skip to content

Commit

Permalink
[debuginfo-tests][dexter] Add --builder gcc support for POSIX
Browse files Browse the repository at this point in the history
Differential Revision: https://reviews.llvm.org/D75339
  • Loading branch information
Pierre-vh committed Mar 3, 2020
1 parent d8ad7cc commit b4b9fa5
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
16 changes: 16 additions & 0 deletions debuginfo-tests/dexter/dex/builder/scripts/posix/gcc.sh
@@ -0,0 +1,16 @@
#!/usr/bin/env bash
set -e

if test -z "$PATHTOGCC"; then
PATHTOGCC=gcc
fi

for INDEX in $SOURCE_INDEXES
do
CFLAGS=$(eval echo "\$COMPILER_OPTIONS_$INDEX")
SRCFILE=$(eval echo "\$SOURCE_FILE_$INDEX")
OBJFILE=$(eval echo "\$OBJECT_FILE_$INDEX")
$PATHTOGCC -std=gnu++11 -c $CFLAGS $SRCFILE -o $OBJFILE
done

$PATHTOGCC $LINKER_OPTIONS $OBJECT_FILES -o $EXECUTABLE_FILE
12 changes: 9 additions & 3 deletions debuginfo-tests/dexter/dex/tools/clang_opt_bisect/Tool.py
Expand Up @@ -77,6 +77,13 @@ def _get_bisect_limits(self):

return limits

def handle_options(self, defaults):
options = self.context.options
if "clang" not in options.builder.lower():
raise Error("--builder %s is not supported by the clang-opt-bisect tool - only 'clang' is "
"supported " % options.builder)
super(Tool, self).handle_options(defaults)

def _run_test(self, test_name): # noqa
options = self.context.options

Expand Down Expand Up @@ -177,7 +184,7 @@ def _run_test(self, test_name): # noqa
file_name = ''.join(
c for c in file_name
if c.isalnum() or c in '()-_./ ').strip().replace(
' ', '_').replace('/', '_')
' ', '_').replace('/', '_')

output_text_path = os.path.join(options.results_directory,
'{}.txt'.format(file_name))
Expand All @@ -188,7 +195,7 @@ def _run_test(self, test_name): # noqa
heuristic_verbose_output + '\n', stream=Stream(fp))

output_dextIR_path = os.path.join(options.results_directory,
'{}.dextIR'.format(file_name))
'{}.dextIR'.format(file_name))
with open(output_dextIR_path, 'wb') as fp:
pickle.dump(steps, fp, protocol=pickle.HIGHEST_PROTOCOL)

Expand Down Expand Up @@ -229,7 +236,6 @@ def _handle_results(self) -> ReturnCode:
self._all_bisect_pass_summary)
return ReturnCode.OK


def _clang_opt_bisect_build(self, opt_bisect_limits):
options = self.context.options
compiler_options = [
Expand Down

0 comments on commit b4b9fa5

Please sign in to comment.