[PATCH] D75339: [debuginfo-tests][dexter] Add --builder gcc support for POSIX
Pierre van Houtryve via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Mar 3 01:16:48 PST 2020
Pierre-vh updated this revision to Diff 247816.
Pierre-vh added a comment.
Here is the updated revision with `_verify_options` removed.
Note that it also contains 2 minor formatting fixes, but if you want I can remove them.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D75339/new/
https://reviews.llvm.org/D75339
Files:
debuginfo-tests/dexter/dex/builder/scripts/posix/gcc.sh
debuginfo-tests/dexter/dex/tools/clang_opt_bisect/Tool.py
Index: debuginfo-tests/dexter/dex/tools/clang_opt_bisect/Tool.py
===================================================================
--- debuginfo-tests/dexter/dex/tools/clang_opt_bisect/Tool.py
+++ debuginfo-tests/dexter/dex/tools/clang_opt_bisect/Tool.py
@@ -77,6 +77,13 @@
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
@@ -177,7 +184,7 @@
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))
@@ -188,7 +195,7 @@
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)
@@ -229,7 +236,6 @@
self._all_bisect_pass_summary)
return ReturnCode.OK
-
def _clang_opt_bisect_build(self, opt_bisect_limits):
options = self.context.options
compiler_options = [
Index: debuginfo-tests/dexter/dex/builder/scripts/posix/gcc.sh
===================================================================
--- /dev/null
+++ 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75339.247816.patch
Type: text/x-patch
Size: 2510 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200303/af6edb66/attachment.bin>
More information about the llvm-commits
mailing list