tests/sources/tar.py: Converted tar test to use the CLI and enhanced

Now test to also ensure that base-dir expressions always behave
the same way regardless of whether the tarball was created with
a leading '.' or not.

13 files changed, 12 insertions, 9 deletions

diff --git a/tests/sources/tar/fetch/a/b/d b/tests/sources/tar/explicit-basedir/content/a/b/d
index 4bcfe98e6..4bcfe98e6 100644
--- a/tests/sources/tar/fetch/a/b/d
+++ b/tests/sources/tar/explicit-basedir/content/a/b/d
diff --git a/tests/sources/tar/fetch/a/c b/tests/sources/tar/explicit-basedir/content/a/c
index f2ad6c76f..f2ad6c76f 100644
--- a/tests/sources/tar/fetch/a/c
+++ b/tests/sources/tar/explicit-basedir/content/a/c
diff --git a/tests/sources/tar/explicit-basedir/target.bst b/tests/sources/tar/explicit-basedir/target.bst
new file mode 100644
index 000000000..fb85bdf42
--- /dev/null
+++ b/tests/sources/tar/explicit-basedir/target.bst
@@ -0,0 +1,7 @@
+kind: import
+description: The kind of this element is irrelevant.
+sources:
+- kind: tar
+  url: tmpdir:/a.tar.gz
+  ref: foo
+  base-dir: 'a'
diff --git a/tests/sources/tar/no-basedir/a/b/d b/tests/sources/tar/fetch/content/a/b/d
index 4bcfe98e6..4bcfe98e6 100644
--- a/tests/sources/tar/no-basedir/a/b/d
+++ b/tests/sources/tar/fetch/content/a/b/d
diff --git a/tests/sources/tar/no-basedir/a/c b/tests/sources/tar/fetch/content/a/c
index f2ad6c76f..f2ad6c76f 100644
--- a/tests/sources/tar/no-basedir/a/c
+++ b/tests/sources/tar/fetch/content/a/c
diff --git a/tests/sources/tar/fetch/project.conf b/tests/sources/tar/fetch/project.conf
deleted file mode 100644
index afa0f5475..000000000
--- a/tests/sources/tar/fetch/project.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Basic project
-name: foo
diff --git a/tests/sources/tar/fetch/target.bst b/tests/sources/tar/fetch/target.bst
index 8bdf8997a..ad413a2f4 100644
--- a/tests/sources/tar/fetch/target.bst
+++ b/tests/sources/tar/fetch/target.bst
@@ -1,4 +1,4 @@
-kind: foo
+kind: import
 description: The kind of this element is irrelevant.
 sources:
 - kind: tar
diff --git a/tests/sources/tar/no-basedir/content/a/b/d b/tests/sources/tar/no-basedir/content/a/b/d
new file mode 100644
index 000000000..4bcfe98e6
--- /dev/null
+++ b/tests/sources/tar/no-basedir/content/a/b/d
@@ -0,0 +1 @@
+d
diff --git a/tests/sources/tar/no-basedir/content/a/c b/tests/sources/tar/no-basedir/content/a/c
new file mode 100644
index 000000000..f2ad6c76f
--- /dev/null
+++ b/tests/sources/tar/no-basedir/content/a/c
@@ -0,0 +1 @@
+c
diff --git a/tests/sources/tar/no-basedir/project.conf b/tests/sources/tar/no-basedir/project.conf
deleted file mode 100644
index afa0f5475..000000000
--- a/tests/sources/tar/no-basedir/project.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Basic project
-name: foo
diff --git a/tests/sources/tar/no-basedir/target.bst b/tests/sources/tar/no-basedir/target.bst
index e6ace2796..5a34d87a3 100644
--- a/tests/sources/tar/no-basedir/target.bst
+++ b/tests/sources/tar/no-basedir/target.bst
@@ -1,4 +1,4 @@
-kind: foo
+kind: import
 description: The kind of this element is irrelevant.
 sources:
 - kind: tar
diff --git a/tests/sources/tar/no-ref/project.conf b/tests/sources/tar/no-ref/project.conf
deleted file mode 100644
index afa0f5475..000000000
--- a/tests/sources/tar/no-ref/project.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Basic project
-name: foo
diff --git a/tests/sources/tar/no-ref/target.bst b/tests/sources/tar/no-ref/target.bst
index 84978ef23..5a73fa25b 100644
--- a/tests/sources/tar/no-ref/target.bst
+++ b/tests/sources/tar/no-ref/target.bst
@@ -1,4 +1,4 @@
-kind: foo
+kind: autotools
 description: The kind of this element is irrelevant.
 sources:
 - kind: tar