aboutsummaryrefslogtreecommitdiff
path: root/tests/manifest
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-11-14 22:18:20 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-11-15 23:06:43 +0300
commit05912fbf27846af1f4ca1b824cc39815179d430e (patch)
tree60c44466d29ceed659f11e8ae201d483d253d8ed /tests/manifest
parent29b5a3d01b5c2228ae1db6c9237989f54f5f2b52 (diff)
Add support for repository typed URLs (git+https://..., etc)
Diffstat (limited to 'tests/manifest')
-rw-r--r--tests/manifest/task-response.testscript2
-rw-r--r--tests/manifest/task.testscript40
2 files changed, 33 insertions, 9 deletions
diff --git a/tests/manifest/task-response.testscript b/tests/manifest/task-response.testscript
index b424cbf..b66313f 100644
--- a/tests/manifest/task-response.testscript
+++ b/tests/manifest/task-response.testscript
@@ -23,7 +23,6 @@ test.options += -ts
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
machine: windows_10-msvc_14
target: x86_64-microsoft-win32-msvc14.0
EOF
@@ -38,7 +37,6 @@ test.options += -ts
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
machine: windows_10-msvc_14
target: x86_64-microsoft-win32-msvc14.0
EOF
diff --git a/tests/manifest/task.testscript b/tests/manifest/task.testscript
index e68bd09..413338f 100644
--- a/tests/manifest/task.testscript
+++ b/tests/manifest/task.testscript
@@ -16,7 +16,6 @@ test.options += -t
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
trust: AB:0D:3F:C1:B0:13:E4:0E:AD:4A:08:06:AE:F3:85:DB:E2:27:5F:83:11:47:A2:7\
8:64:3C:73:60:F8:66:3A:A4
machine: windows_10-msvc_14
@@ -32,11 +31,40 @@ test.options += -t
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
machine: windows_10-msvc_14
target: x86_64-microsoft-win32-msvc14.0
EOF
+ : typed-url
+ :
+ $* <<EOF >>EOF
+ : 1
+ name: libfoo
+ version: 1.0
+ repository-url: git+http://example.org/math
+ machine: windows_10-msvc_14
+ target: x86_64-microsoft-win32-msvc14.0
+ EOF
+
+ : repo-type
+ :
+ $* <<EOI >>EOO
+ : 1
+ name: libfoo
+ version: 1.0
+ repository-url: http://git.example.org/math
+ repository-type: git
+ machine: windows_10-msvc_14
+ target: x86_64-microsoft-win32-msvc14.0
+ EOI
+ : 1
+ name: libfoo
+ version: 1.0
+ repository-url: git+http://git.example.org/math
+ machine: windows_10-msvc_14
+ target: x86_64-microsoft-win32-msvc14.0
+ EOO
+
: config
:
{
@@ -47,7 +75,6 @@ test.options += -t
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
machine: windows
target: x86_64-microsoft-win32-msvc14.0
config: abc=
@@ -60,7 +87,6 @@ test.options += -t
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
machine: windows
target: x86_64-microsoft-win32-msvc14.0
config: abc='a "b '"d\e x y="
@@ -74,7 +100,6 @@ test.options += -t
name: libfoo
version: 1.0
repository-url: http://pkg.example.org/1/math
- repository-type: pkg
trust: yes
machine: windows_10-msvc_14
target: x86_64-microsoft-win32-msvc14.0
@@ -312,12 +337,13 @@ EOI
: repository-type
:
- $* <<EOI 2>'stdin:6:1: error: no task repository type specified' == 1
+ $* <<EOI 2>'stdin:4:17: error: invalid task repository URL: missing repository version' == 1
: 1
name: libfoo
version: 1.0
- repository-url: http://pkg.example.org/1/math
+ repository-url: http://git.example.org/math
machine: windows_10-msvc_14
+ target: x86_64-microsoft-win32-msvc14.0
EOI
: machine