Cold-Air-Networks/mirror-llvm-project
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 7

[BOLT] Fix tests that were unresolved when using lit's internal shell

Browse source 
These two tests were unresolved when using lit's internal shell.

In the case of tail-duplication-constant-prop, it was because they were
using a echo $? line, and lit's internal echo implementation does not
support $? to get the return code. The test was never actually asserting
anything about the return code though, so I've removed the echo
commands.

In the case of permission.test, it was because umask was not supported
before #155850, and afterwards not without an argument. The test also
was not great at capturing what it was supposed to (leaving open
possibilites like the system umask and what Bolt was using happening to
match), so I've rewritten the test in the style of
llvm/test/tools/llvm-objcopy/ELF/respect-umask.test.

This fixes #102693.

Reviewers:
maksfb, yota9, ayermolo, yozhu, aaupov, rafaelauler, paschalis-mpeis

Reviewed By: maksfb

Pull Request: https://github.com/llvm/llvm-project/pull/156082
This commit is contained in:
Aiden Grossman 2025-08-29 12:51:21 -07:00 committed by GitHub
parent dfc376a9bf
commit 80c2179790
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bolt/test/permission.test
View file

@ -1,13 +1,28 @@
# Ensure that the permissions of the optimized binary file comply with the
# system's umask.
# This test performs a logical AND operation on the results of the `stat -c %a
# %t.bolt` and `umask` commands (both results are displayed in octal), and
# checks whether the result is equal to 0.
REQUIRES: shell, system-linux
# This test uses umask, which is Linux specific.
REQUIRES: system-linux
RUN: %clang %cflags %p/Inputs/hello.c -o %t -Wl,-q
RUN: llvm-bolt %t -o %t.bolt
RUN: echo $(( 8#$(stat -c %a %t.bolt) & 8#$(umask) )) | FileCheck %s
# RUN: rm -f %t
# RUN: touch %t
# RUN: chmod 0755 %t
# RUN: ls -l %t | cut -f 1 -d ' ' > %t.0755
# RUN: chmod 0600 %t
# RUN: ls -l %t | cut -f 1 -d ' ' > %t.0600
# RUN: chmod 0655 %t
# RUN: ls -l %t | cut -f 1 -d ' ' > %t.0655
CHECK: 0
RUN: %clang %cflags %p/Inputs/hello.c -o %t.exe -Wl,-q
RUN: umask 0022
RUN: llvm-bolt %t.exe -o %t1
RUN: ls -l %t1 | cut -f 1 -d ' ' | cmp - %t.0755
RUN: umask 0177
RUN: llvm-bolt %t.exe -o %t2
RUN: ls -l %t2 | cut -f 1 -d ' ' | cmp - %t.0600
RUN: umask 0122
RUN: llvm-bolt %t.exe -o %t3
RUN: ls -l %t3 | cut -f 1 -d ' ' | cmp - %t.0655

4
bolt/test/runtime/X86/tail-duplication-constant-prop.s
View file

@ -8,8 +8,8 @@
# RUN: --print-finalized \
# RUN: --tail-duplication=moderate --tail-duplication-minimum-offset=1 \
# RUN: --tail-duplication-const-copy-propagation=1 -o %t.out | FileCheck %s
# RUN: %t.exe; echo $?
# RUN: %t.out; echo $?
# RUN: not %t.exe
# RUN: not %t.out
# FDATA: 1 main 14 1 main #.BB2# 0 10
# FDATA: 1 main 16 1 main #.BB2# 0 20