Skip to content

Commit aae4833

Browse files
Il-CapitanoIl-Capitano
committed
Address review feedback in tests
1 parent 69048e3 commit aae4833

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎lld/test/ELF/aarch64-execute-only-report.s‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
// REQUIRES: aarch64
22

3-
// RUN: llvm-mc --triple=aarch64 --filetype=obj -o %t.o %s
4-
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
5-
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
6-
// RUN: | FileCheck --check-prefix=WARNING %s
7-
// RUN: ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
8-
// RUN: | FileCheck --check-prefix=WARNING %s
9-
// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
10-
// RUN: | FileCheck --check-prefix=ERROR %s
11-
// RUN: not ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=error %t.o -o /dev/null 2>&1 \
12-
// RUN: | FileCheck --check-prefix=ERROR %s
13-
14-
// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
15-
// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
16-
// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
3+
// RUN: rm -rf %t && mkdir %t && cd %t
4+
// RUN: llvm-mc --triple=aarch64 --filetype=obj %s -o a.o
5+
6+
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings a.o
7+
8+
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning a.o 2>&1 | \
9+
// RUN: FileCheck --check-prefix=WARNING %s
10+
// RUN: ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=warning a.o 2>&1 | \
11+
// RUN: FileCheck --check-prefix=WARNING %s
12+
13+
// WARNING-NOT: warning: -z execute-only-report: a.o:(.text) does not have SHF_AARCH64_PURECODE flag set
14+
// WARNING-NOT: warning: -z execute-only-report: a.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
15+
// WARNING: warning: -z execute-only-report: a.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
1716
// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
1817

19-
// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
20-
// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
21-
// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
18+
// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error a.o 2>&1 | \
19+
// RUN: FileCheck --check-prefix=ERROR %s
20+
// RUN: not ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=error a.o 2>&1 | \
21+
// RUN: FileCheck --check-prefix=ERROR %s
22+
23+
// ERROR-NOT: error: -z execute-only-report: a.o:(.text) does not have SHF_AARCH64_PURECODE flag set
24+
// ERROR-NOT: error: -z execute-only-report: a.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
25+
// ERROR: error: -z execute-only-report: a.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
2226
// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
2327

2428
.section .text,"axy",@progbits,unique,0

‎lld/test/ELF/arm-execute-only-report.s‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11
// REQUIRES: arm
22

3-
// RUN: llvm-mc --triple=armv7 --filetype=obj -o %t.o %s
4-
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
5-
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
6-
// RUN: | FileCheck --check-prefix=WARNING %s
7-
// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
8-
// RUN: | FileCheck --check-prefix=ERROR %s
9-
10-
// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
11-
// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
12-
// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
3+
// RUN: rm -rf %t && mkdir %t && cd %t
4+
// RUN: llvm-mc --triple=armv7 --filetype=obj %s -o a.o
5+
6+
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings a.o
7+
8+
// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning a.o 2>&1 | \
9+
// RUN: FileCheck --check-prefix=WARNING %s
10+
11+
// WARNING-NOT: warning: -z execute-only-report: a.o:(.text) does not have SHF_ARM_PURECODE flag set
12+
// WARNING-NOT: warning: -z execute-only-report: a.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
13+
// WARNING: warning: -z execute-only-report: a.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
1314
// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
1415

15-
// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
16-
// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
17-
// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
16+
// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error a.o 2>&1 | \
17+
// RUN: FileCheck --check-prefix=ERROR %s
18+
19+
// ERROR-NOT: error: -z execute-only-report: a.o:(.text) does not have SHF_ARM_PURECODE flag set
20+
// ERROR-NOT: error: -z execute-only-report: a.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
21+
// ERROR: error: -z execute-only-report: a.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
1822
// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
1923

2024
.section .text,"axy",%progbits,unique,0

‎lld/test/ELF/execute-only-report-error.s‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎lld/test/ELF/target-specific-options.s‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,15 @@
1313
# RUN: not ld.lld %t --toc-optimize -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR-TOC
1414
# ERR-TOC: error: --toc-optimize is only supported on PowerPC64 targets
1515

16+
# RUN: not ld.lld %t -z execute-only-report=warning -o /dev/null 2>&1 | \
17+
# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY
18+
# RUN: not ld.lld %t -z execute-only-report=error -o /dev/null 2>&1 | \
19+
# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY
20+
# ERR-EXECUTE-ONLY: error: -z execute-only-report only supported on AArch64 and ARM
21+
22+
# RUN: not ld.lld %t -z execute-only-report=foo -o /dev/null 2>&1 | \
23+
# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY-INVALID
24+
# ERR-EXECUTE-ONLY-INVALID: error: -z execute-only-report= parameter foo is not recognized
25+
1626
.globl _start
1727
_start:

0 commit comments

Comments
 (0)