[llvm] [Object][Wasm] Move wasm Object tests into their own directory (NFC) (PR #81072)
Derek Schuff via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 10 16:14:29 PDT 2024
https://github.com/dschuff updated https://github.com/llvm/llvm-project/pull/81072
>From 7b63a4427ca15292f00a85fbe99d24eeb9d4b0d6 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff at chromium.org>
Date: Wed, 7 Feb 2024 17:15:29 -0800
Subject: [PATCH 1/3] [Object][Wasm] Move wasm Object tests into their own
directory (NFC)
---
llvm/test/Object/{ => Wasm}/wasm-bad-data-symbol.yaml | 0
llvm/test/Object/{ => Wasm}/wasm-bad-metadata-version.yaml | 0
llvm/test/Object/{ => Wasm}/wasm-bad-reloc-type.test | 0
llvm/test/Object/{ => Wasm}/wasm-bad-symbol-type.test | 0
llvm/test/Object/{ => Wasm}/wasm-duplicate-name.test | 0
llvm/test/Object/{ => Wasm}/wasm-invalid-file.yaml | 0
llvm/test/Object/{ => Wasm}/wasm-invalid-section-order.test | 0
llvm/test/Object/{ => Wasm}/wasm-invalid-start.test | 0
llvm/test/Object/{ => Wasm}/wasm-missing-version.test | 0
llvm/test/Object/{ => Wasm}/wasm-obj2yaml-tables.test | 0
llvm/test/Object/{ => Wasm}/wasm-relocs-and-producers.yaml | 0
llvm/test/Object/{ => Wasm}/wasm-string-outside-section.test | 0
12 files changed, 0 insertions(+), 0 deletions(-)
rename llvm/test/Object/{ => Wasm}/wasm-bad-data-symbol.yaml (100%)
rename llvm/test/Object/{ => Wasm}/wasm-bad-metadata-version.yaml (100%)
rename llvm/test/Object/{ => Wasm}/wasm-bad-reloc-type.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-bad-symbol-type.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-duplicate-name.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-invalid-file.yaml (100%)
rename llvm/test/Object/{ => Wasm}/wasm-invalid-section-order.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-invalid-start.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-missing-version.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-obj2yaml-tables.test (100%)
rename llvm/test/Object/{ => Wasm}/wasm-relocs-and-producers.yaml (100%)
rename llvm/test/Object/{ => Wasm}/wasm-string-outside-section.test (100%)
diff --git a/llvm/test/Object/wasm-bad-data-symbol.yaml b/llvm/test/Object/Wasm/wasm-bad-data-symbol.yaml
similarity index 100%
rename from llvm/test/Object/wasm-bad-data-symbol.yaml
rename to llvm/test/Object/Wasm/wasm-bad-data-symbol.yaml
diff --git a/llvm/test/Object/wasm-bad-metadata-version.yaml b/llvm/test/Object/Wasm/wasm-bad-metadata-version.yaml
similarity index 100%
rename from llvm/test/Object/wasm-bad-metadata-version.yaml
rename to llvm/test/Object/Wasm/wasm-bad-metadata-version.yaml
diff --git a/llvm/test/Object/wasm-bad-reloc-type.test b/llvm/test/Object/Wasm/wasm-bad-reloc-type.test
similarity index 100%
rename from llvm/test/Object/wasm-bad-reloc-type.test
rename to llvm/test/Object/Wasm/wasm-bad-reloc-type.test
diff --git a/llvm/test/Object/wasm-bad-symbol-type.test b/llvm/test/Object/Wasm/wasm-bad-symbol-type.test
similarity index 100%
rename from llvm/test/Object/wasm-bad-symbol-type.test
rename to llvm/test/Object/Wasm/wasm-bad-symbol-type.test
diff --git a/llvm/test/Object/wasm-duplicate-name.test b/llvm/test/Object/Wasm/wasm-duplicate-name.test
similarity index 100%
rename from llvm/test/Object/wasm-duplicate-name.test
rename to llvm/test/Object/Wasm/wasm-duplicate-name.test
diff --git a/llvm/test/Object/wasm-invalid-file.yaml b/llvm/test/Object/Wasm/wasm-invalid-file.yaml
similarity index 100%
rename from llvm/test/Object/wasm-invalid-file.yaml
rename to llvm/test/Object/Wasm/wasm-invalid-file.yaml
diff --git a/llvm/test/Object/wasm-invalid-section-order.test b/llvm/test/Object/Wasm/wasm-invalid-section-order.test
similarity index 100%
rename from llvm/test/Object/wasm-invalid-section-order.test
rename to llvm/test/Object/Wasm/wasm-invalid-section-order.test
diff --git a/llvm/test/Object/wasm-invalid-start.test b/llvm/test/Object/Wasm/wasm-invalid-start.test
similarity index 100%
rename from llvm/test/Object/wasm-invalid-start.test
rename to llvm/test/Object/Wasm/wasm-invalid-start.test
diff --git a/llvm/test/Object/wasm-missing-version.test b/llvm/test/Object/Wasm/wasm-missing-version.test
similarity index 100%
rename from llvm/test/Object/wasm-missing-version.test
rename to llvm/test/Object/Wasm/wasm-missing-version.test
diff --git a/llvm/test/Object/wasm-obj2yaml-tables.test b/llvm/test/Object/Wasm/wasm-obj2yaml-tables.test
similarity index 100%
rename from llvm/test/Object/wasm-obj2yaml-tables.test
rename to llvm/test/Object/Wasm/wasm-obj2yaml-tables.test
diff --git a/llvm/test/Object/wasm-relocs-and-producers.yaml b/llvm/test/Object/Wasm/wasm-relocs-and-producers.yaml
similarity index 100%
rename from llvm/test/Object/wasm-relocs-and-producers.yaml
rename to llvm/test/Object/Wasm/wasm-relocs-and-producers.yaml
diff --git a/llvm/test/Object/wasm-string-outside-section.test b/llvm/test/Object/Wasm/wasm-string-outside-section.test
similarity index 100%
rename from llvm/test/Object/wasm-string-outside-section.test
rename to llvm/test/Object/Wasm/wasm-string-outside-section.test
>From cb8c841b27bb8e93ded31eecf6efa54ac11554d7 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff at chromium.org>
Date: Wed, 7 Feb 2024 17:26:27 -0800
Subject: [PATCH 2/3] rename files
---
.../Wasm/{wasm-bad-data-symbol.yaml => bad-data-symbol.yaml} | 0
.../{wasm-bad-metadata-version.yaml => bad-metadata-version.yaml} | 0
.../Object/Wasm/{wasm-bad-reloc-type.test => bad-reloc-type.test} | 0
.../Wasm/{wasm-bad-symbol-type.test => bad-symbol-type.test} | 0
.../Object/Wasm/{wasm-duplicate-name.test => duplicate-name.test} | 0
.../Object/Wasm/{wasm-invalid-file.yaml => invalid-file.yaml} | 0
...wasm-invalid-section-order.test => invalid-section-order.test} | 0
.../Object/Wasm/{wasm-invalid-start.test => invalid-start.test} | 0
.../Wasm/{wasm-missing-version.test => missing-version.test} | 0
.../Wasm/{wasm-obj2yaml-tables.test => obj2yaml-tables.test} | 0
.../{wasm-relocs-and-producers.yaml => relocs-and-producers.yaml} | 0
...sm-string-outside-section.test => string-outside-section.test} | 0
12 files changed, 0 insertions(+), 0 deletions(-)
rename llvm/test/Object/Wasm/{wasm-bad-data-symbol.yaml => bad-data-symbol.yaml} (100%)
rename llvm/test/Object/Wasm/{wasm-bad-metadata-version.yaml => bad-metadata-version.yaml} (100%)
rename llvm/test/Object/Wasm/{wasm-bad-reloc-type.test => bad-reloc-type.test} (100%)
rename llvm/test/Object/Wasm/{wasm-bad-symbol-type.test => bad-symbol-type.test} (100%)
rename llvm/test/Object/Wasm/{wasm-duplicate-name.test => duplicate-name.test} (100%)
rename llvm/test/Object/Wasm/{wasm-invalid-file.yaml => invalid-file.yaml} (100%)
rename llvm/test/Object/Wasm/{wasm-invalid-section-order.test => invalid-section-order.test} (100%)
rename llvm/test/Object/Wasm/{wasm-invalid-start.test => invalid-start.test} (100%)
rename llvm/test/Object/Wasm/{wasm-missing-version.test => missing-version.test} (100%)
rename llvm/test/Object/Wasm/{wasm-obj2yaml-tables.test => obj2yaml-tables.test} (100%)
rename llvm/test/Object/Wasm/{wasm-relocs-and-producers.yaml => relocs-and-producers.yaml} (100%)
rename llvm/test/Object/Wasm/{wasm-string-outside-section.test => string-outside-section.test} (100%)
diff --git a/llvm/test/Object/Wasm/wasm-bad-data-symbol.yaml b/llvm/test/Object/Wasm/bad-data-symbol.yaml
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-bad-data-symbol.yaml
rename to llvm/test/Object/Wasm/bad-data-symbol.yaml
diff --git a/llvm/test/Object/Wasm/wasm-bad-metadata-version.yaml b/llvm/test/Object/Wasm/bad-metadata-version.yaml
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-bad-metadata-version.yaml
rename to llvm/test/Object/Wasm/bad-metadata-version.yaml
diff --git a/llvm/test/Object/Wasm/wasm-bad-reloc-type.test b/llvm/test/Object/Wasm/bad-reloc-type.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-bad-reloc-type.test
rename to llvm/test/Object/Wasm/bad-reloc-type.test
diff --git a/llvm/test/Object/Wasm/wasm-bad-symbol-type.test b/llvm/test/Object/Wasm/bad-symbol-type.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-bad-symbol-type.test
rename to llvm/test/Object/Wasm/bad-symbol-type.test
diff --git a/llvm/test/Object/Wasm/wasm-duplicate-name.test b/llvm/test/Object/Wasm/duplicate-name.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-duplicate-name.test
rename to llvm/test/Object/Wasm/duplicate-name.test
diff --git a/llvm/test/Object/Wasm/wasm-invalid-file.yaml b/llvm/test/Object/Wasm/invalid-file.yaml
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-invalid-file.yaml
rename to llvm/test/Object/Wasm/invalid-file.yaml
diff --git a/llvm/test/Object/Wasm/wasm-invalid-section-order.test b/llvm/test/Object/Wasm/invalid-section-order.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-invalid-section-order.test
rename to llvm/test/Object/Wasm/invalid-section-order.test
diff --git a/llvm/test/Object/Wasm/wasm-invalid-start.test b/llvm/test/Object/Wasm/invalid-start.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-invalid-start.test
rename to llvm/test/Object/Wasm/invalid-start.test
diff --git a/llvm/test/Object/Wasm/wasm-missing-version.test b/llvm/test/Object/Wasm/missing-version.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-missing-version.test
rename to llvm/test/Object/Wasm/missing-version.test
diff --git a/llvm/test/Object/Wasm/wasm-obj2yaml-tables.test b/llvm/test/Object/Wasm/obj2yaml-tables.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-obj2yaml-tables.test
rename to llvm/test/Object/Wasm/obj2yaml-tables.test
diff --git a/llvm/test/Object/Wasm/wasm-relocs-and-producers.yaml b/llvm/test/Object/Wasm/relocs-and-producers.yaml
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-relocs-and-producers.yaml
rename to llvm/test/Object/Wasm/relocs-and-producers.yaml
diff --git a/llvm/test/Object/Wasm/wasm-string-outside-section.test b/llvm/test/Object/Wasm/string-outside-section.test
similarity index 100%
rename from llvm/test/Object/Wasm/wasm-string-outside-section.test
rename to llvm/test/Object/Wasm/string-outside-section.test
>From 046b9297e035ee4387db9643deac497011b39518 Mon Sep 17 00:00:00 2001
From: Derek Schuff <dschuff at chromium.org>
Date: Wed, 10 Apr 2024 15:54:14 -0700
Subject: [PATCH 3/3] update paths in other tests
---
llvm/test/Object/Wasm/bad-reloc-type.test | 2 +-
.../{wasm-bad-relocation.yaml => Wasm/bad-relocation.yaml} | 0
llvm/test/Object/Wasm/bad-symbol-type.test | 2 +-
llvm/test/Object/Wasm/invalid-section-order.test | 2 +-
.../linked-namesec-with-linkingsec.yaml} | 0
.../linked-symbol-table.yaml} | 0
llvm/test/Object/Wasm/missing-version.test | 2 +-
llvm/test/Object/Wasm/obj2yaml-tables.test | 2 +-
llvm/test/Object/Wasm/string-outside-section.test | 2 +-
9 files changed, 6 insertions(+), 6 deletions(-)
rename llvm/test/Object/{wasm-bad-relocation.yaml => Wasm/bad-relocation.yaml} (100%)
rename llvm/test/Object/{wasm-linked-namesec-with-linkingsec.yaml => Wasm/linked-namesec-with-linkingsec.yaml} (100%)
rename llvm/test/Object/{wasm-linked-symbol-table.yaml => Wasm/linked-symbol-table.yaml} (100%)
diff --git a/llvm/test/Object/Wasm/bad-reloc-type.test b/llvm/test/Object/Wasm/bad-reloc-type.test
index 000acbd55fce53..4e210271c0b93e 100644
--- a/llvm/test/Object/Wasm/bad-reloc-type.test
+++ b/llvm/test/Object/Wasm/bad-reloc-type.test
@@ -1,3 +1,3 @@
-RUN: not llvm-objdump -s %p/Inputs/WASM/bad-reloc-type.wasm 2>&1 | FileCheck %s
+RUN: not llvm-objdump -s %p/../Inputs/WASM/bad-reloc-type.wasm 2>&1 | FileCheck %s
CHECK: invalid relocation type: 63
diff --git a/llvm/test/Object/wasm-bad-relocation.yaml b/llvm/test/Object/Wasm/bad-relocation.yaml
similarity index 100%
rename from llvm/test/Object/wasm-bad-relocation.yaml
rename to llvm/test/Object/Wasm/bad-relocation.yaml
diff --git a/llvm/test/Object/Wasm/bad-symbol-type.test b/llvm/test/Object/Wasm/bad-symbol-type.test
index 4b7c30ad8b7387..5b9770f18bb621 100644
--- a/llvm/test/Object/Wasm/bad-symbol-type.test
+++ b/llvm/test/Object/Wasm/bad-symbol-type.test
@@ -1,3 +1,3 @@
-RUN: not llvm-objdump -s %p/Inputs/WASM/bad-symbol-type.wasm 2>&1 | FileCheck %s
+RUN: not llvm-objdump -s %p/../Inputs/WASM/bad-symbol-type.wasm 2>&1 | FileCheck %s
CHECK: invalid symbol type: 63
diff --git a/llvm/test/Object/Wasm/invalid-section-order.test b/llvm/test/Object/Wasm/invalid-section-order.test
index 9a67f09150e5eb..93cf9eb57059c1 100644
--- a/llvm/test/Object/Wasm/invalid-section-order.test
+++ b/llvm/test/Object/Wasm/invalid-section-order.test
@@ -1,4 +1,4 @@
-# RUN: not obj2yaml %p/Inputs/WASM/invalid-section-order.wasm 2>&1 | FileCheck %s
+# RUN: not obj2yaml %p/../Inputs/WASM/invalid-section-order.wasm 2>&1 | FileCheck %s
# CHECK: {{.*}}: out of order section type: 10
# Inputs/WASM/invalid-section-order.wasm is generated from this ll file, by
diff --git a/llvm/test/Object/wasm-linked-namesec-with-linkingsec.yaml b/llvm/test/Object/Wasm/linked-namesec-with-linkingsec.yaml
similarity index 100%
rename from llvm/test/Object/wasm-linked-namesec-with-linkingsec.yaml
rename to llvm/test/Object/Wasm/linked-namesec-with-linkingsec.yaml
diff --git a/llvm/test/Object/wasm-linked-symbol-table.yaml b/llvm/test/Object/Wasm/linked-symbol-table.yaml
similarity index 100%
rename from llvm/test/Object/wasm-linked-symbol-table.yaml
rename to llvm/test/Object/Wasm/linked-symbol-table.yaml
diff --git a/llvm/test/Object/Wasm/missing-version.test b/llvm/test/Object/Wasm/missing-version.test
index beb0b5e9105bf9..754658e9d0ddce 100644
--- a/llvm/test/Object/Wasm/missing-version.test
+++ b/llvm/test/Object/Wasm/missing-version.test
@@ -1,2 +1,2 @@
-# RUN: not llvm-objdump -h %p/Inputs/WASM/missing-version.wasm 2>&1 | FileCheck %s
+# RUN: not llvm-objdump -h %p/../Inputs/WASM/missing-version.wasm 2>&1 | FileCheck %s
# CHECK: {{.*}}: missing version number
diff --git a/llvm/test/Object/Wasm/obj2yaml-tables.test b/llvm/test/Object/Wasm/obj2yaml-tables.test
index 870ffd179a1c25..877238437b0105 100644
--- a/llvm/test/Object/Wasm/obj2yaml-tables.test
+++ b/llvm/test/Object/Wasm/obj2yaml-tables.test
@@ -1,4 +1,4 @@
-RUN: obj2yaml %p/Inputs/WASM/multi-table.wasm | FileCheck %s
+RUN: obj2yaml %p/../Inputs/WASM/multi-table.wasm | FileCheck %s
# CHECK: - Type: TABLE
diff --git a/llvm/test/Object/Wasm/string-outside-section.test b/llvm/test/Object/Wasm/string-outside-section.test
index 3fa6217bae8e31..31f4a6080d9bdf 100644
--- a/llvm/test/Object/Wasm/string-outside-section.test
+++ b/llvm/test/Object/Wasm/string-outside-section.test
@@ -1,3 +1,3 @@
-RUN: not --crash llvm-objdump -s %p/Inputs/WASM/string-outside-section.wasm 2>&1 | FileCheck %s
+RUN: not --crash llvm-objdump -s %p/../Inputs/WASM/string-outside-section.wasm 2>&1 | FileCheck %s
CHECK: LLVM ERROR: EOF while reading string
More information about the llvm-commits
mailing list