summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraiuto <aiuto@google.com>2021-12-07 00:31:53 -0500
committerGitHub <noreply@github.com>2021-12-07 00:31:53 -0500
commite98cd3fa26de7727545d9a0845033fa3c5909b0a (patch)
treea67d0d395532f1e536ff2b63fc03b2d9163cd53f
parenta5fc44fd1d90e4a331ec2994481663288f29b2a1 (diff)
downloadbazelbuild-rules_pkg-e98cd3fa26de7727545d9a0845033fa3c5909b0a.tar.gz
Stop using //tests/testdata/*.ar for legacy rpm smoke test input files. (#464)
* Stop using //tests/testdata/*.ar for legacy rpm smoke test input files. - There was no need to use the .ar files as input. - They are meaningful data for other tests - I would like to move those tests and their input to another place to properly disentangle pkg_tar tests from others.
-rw-r--r--pkg/legacy/tests/rpm/BUILD11
-rw-r--r--pkg/legacy/tests/rpm/test_rpm.spec11
2 files changed, 5 insertions, 17 deletions
diff --git a/pkg/legacy/tests/rpm/BUILD b/pkg/legacy/tests/rpm/BUILD
index 026fba4..c691707 100644
--- a/pkg/legacy/tests/rpm/BUILD
+++ b/pkg/legacy/tests/rpm/BUILD
@@ -17,16 +17,9 @@ load("//pkg:rpm.bzl", "pkg_rpm")
pkg_rpm(
name = "test-rpm",
- # TODO(aiuto): Replace the use of these .ar files with something more
- # useful to testing rpm builds.
data = [
- "//tests:testdata/a.ar",
- "//tests:testdata/a_ab.ar",
- "//tests:testdata/a_b.ar",
- "//tests:testdata/a_b_ab.ar",
- "//tests:testdata/ab.ar",
- "//tests:testdata/b.ar",
- "//tests:testdata/config",
+ "BUILD",
+ "//pkg/legacy:rpm.bzl",
],
debug = 1,
release = "0",
diff --git a/pkg/legacy/tests/rpm/test_rpm.spec b/pkg/legacy/tests/rpm/test_rpm.spec
index 3c1f167..9cfb5da 100644
--- a/pkg/legacy/tests/rpm/test_rpm.spec
+++ b/pkg/legacy/tests/rpm/test_rpm.spec
@@ -18,13 +18,8 @@ This is a package description.
%build
%install
-cp -r ./tests %{buildroot}/
+cp -r ./pkg/legacy %{buildroot}/
%files
-/tests/testdata/a.ar
-/tests/testdata/a_ab.ar
-/tests/testdata/a_b.ar
-/tests/testdata/a_b_ab.ar
-/tests/testdata/ab.ar
-/tests/testdata/b.ar
-/tests/testdata/config
+/legacy/rpm.bzl
+/legacy/tests/rpm/BUILD