This is an archive of the discontinued LLVM Phabricator instance.

Differential D83711

[AIX] Remove diff -a option on llvm-cov.test
ClosedPublic

Authored by ShuhongL on Jul 13 2020, 12:16 PM.

Details

Reviewers
daltenty
stevewan
hubert.reinterpretcast
Commits
rG85bed2f381ea: [AIX] Remove diff -a option on llvm-cov.test
Summary

llvm-cov.test generates .gcov files and compared with target sample files. Since the files do not contain any binary data (files are plain ASCII texts), remove -a from diff. And this fix will the error on AIX since the default diff tool on AIX does not support -a option.

Diff Detail

Event Timeline

ShuhongL created this revision.Jul 13 2020, 12:16 PM
Herald added a subscriber: llvm-commits. · View Herald TranscriptJul 13 2020, 12:16 PM
Harbormaster failed remote builds in B64029: Diff 277506!Jul 13 2020, 12:26 PM
ShuhongL added a reviewer: hubert.reinterpretcast.Jul 13 2020, 2:21 PM
hubert.reinterpretcast accepted this revision.Jul 13 2020, 3:30 PM
hubert.reinterpretcast marked 2 inline comments as done.

Yes, none of the .gcov reference files appear to be anything other than plain ASCII text. Change LGTM.

llvm/test/tools/llvm-cov/llvm-cov.test
16

Confirmed:

test_no_options.h.gcov: ascii text
160

Confirmed:

test_no_gcda.cpp.gcov: ascii text
test_no_gcda.h.gcov: ascii text
This revision is now accepted and ready to land.Jul 13 2020, 3:30 PM
ShuhongL edited the summary of this revision. (Show Details)Jul 14 2020, 8:22 AM
Closed by commit rG85bed2f381ea: [AIX] Remove diff -a option on llvm-cov.test (authored by ShuhongL). · Explain WhyJul 14 2020, 9:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-cov/
6 lines

Diff 277868

llvm/test/tools/llvm-cov/llvm-cov.test

# Tests for compatibility between llvm-cov and gcov. These work by # Tests for compatibility between llvm-cov and gcov. These work by
# comparing llvm-cov against reference outputs generated by gcov 4.2. # comparing llvm-cov against reference outputs generated by gcov 4.2.
# Test fails on Windows where internal shell is used due to path separator # Test fails on Windows where internal shell is used due to path separator
# mismatches. # mismatches.
REQUIRES: shell REQUIRES: shell
RUN: rm -rf %t RUN: rm -rf %t
RUN: mkdir %t RUN: mkdir %t
RUN: cd %t RUN: cd %t
RUN: cp %p/Inputs/test* . RUN: cp %p/Inputs/test* .
# Basic behaviour with no flags # Basic behaviour with no flags
RUN: llvm-cov gcov test.c 2> %t.err | FileCheck %s --check-prefixes=OUT,OUTFILE --match-full-lines --strict-whitespace RUN: llvm-cov gcov test.c 2> %t.err | FileCheck %s --check-prefixes=OUT,OUTFILE --match-full-lines --strict-whitespace
RUN: FileCheck %s --check-prefix=C --match-full-lines --strict-whitespace < test.cpp.gcov RUN: FileCheck %s --check-prefix=C --match-full-lines --strict-whitespace < test.cpp.gcov
RUN: diff -aub test_no_options.h.gcov test.h.gcov RUN: diff -ub test_no_options.h.gcov test.h.gcov
hubert.reinterpretcastUnsubmitted
Done
ReplyInline Actions

Confirmed:

test_no_options.h.gcov: ascii text
hubert.reinterpretcast: Confirmed: ``` test_no_options.h.gcov: ascii text ```
RUN: count 0 < %t.err RUN: count 0 < %t.err
# Same, but specifying the object directory # Same, but specifying the object directory
RUN: mkdir -p %t/objdir RUN: mkdir -p %t/objdir
RUN: cp test.gcno test.gcda %t/objdir RUN: cp test.gcno test.gcda %t/objdir
RUN: llvm-cov gcov -o objdir test.c | FileCheck %s --check-prefixes=OUT,OUTFILE RUN: llvm-cov gcov -o objdir test.c | FileCheck %s --check-prefixes=OUT,OUTFILE
RUN: FileCheck --input-file=test.cpp.gcov %s --check-prefix=OBJDIR RUN: FileCheck --input-file=test.cpp.gcov %s --check-prefix=OBJDIR
OBJDIR: 0:Graph:objdir/test.gcno OBJDIR: 0:Graph:objdir/test.gcno
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Lines
# Absolute counts for branches. # Absolute counts for branches.
RUN: llvm-cov gcov test.c -a -b -c -u RUN: llvm-cov gcov test.c -a -b -c -u
RUN: FileCheck --input-file=test.h.gcov %s --check-prefix=H-C RUN: FileCheck --input-file=test.h.gcov %s --check-prefix=H-C
H-C: unconditional 0 taken 1 H-C: unconditional 0 taken 1
# Missing gcda file just gives 0 counts. # Missing gcda file just gives 0 counts.
RUN: llvm-cov gcov test.c -gcda=no_such_gcda_file | FileCheck %s --check-prefix=NO-GCDA RUN: llvm-cov gcov test.c -gcda=no_such_gcda_file | FileCheck %s --check-prefix=NO-GCDA
RUN: diff -aub test_no_gcda.cpp.gcov test.cpp.gcov RUN: diff -ub test_no_gcda.cpp.gcov test.cpp.gcov
RUN: diff -aub test_no_gcda.h.gcov test.h.gcov RUN: diff -ub test_no_gcda.h.gcov test.h.gcov
hubert.reinterpretcastUnsubmitted
Done
ReplyInline Actions

Confirmed:

test_no_gcda.cpp.gcov: ascii text
test_no_gcda.h.gcov: ascii text
hubert.reinterpretcast: Confirmed: ``` test_no_gcda.cpp.gcov: ascii text test_no_gcda.h.gcov: ascii text ```
NO-GCDA: File 'test.cpp' NO-GCDA: File 'test.cpp'
NO-GCDA-NEXT: Lines executed:0.00% of 43 NO-GCDA-NEXT: Lines executed:0.00% of 43
NO-GCDA-NEXT: Creating 'test.cpp.gcov' NO-GCDA-NEXT: Creating 'test.cpp.gcov'
NO-GCDA-EMPTY: NO-GCDA-EMPTY:
NO-GCDA-NEXT: File './test.h' NO-GCDA-NEXT: File './test.h'
NO-GCDA-NEXT: Lines executed:0.00% of 1 NO-GCDA-NEXT: Lines executed:0.00% of 1
NO-GCDA-NEXT: Creating 'test.h.gcov' NO-GCDA-NEXT: Creating 'test.h.gcov'
▲ Show 20 Lines • Show All 209 Lines • Show Last 20 Lines