Add repository-type value to task manifest and rename repository value to repository-url

2 files changed, 69 insertions, 20 deletions

diff --git a/tests/manifest/task-response.test b/tests/manifest/task-response.test
index f92e43f..c823160 100644
--- a/tests/manifest/task-response.test
+++ b/tests/manifest/task-response.test
@@ -22,7 +22,8 @@ test.options += -ts
     :
     name: libfoo
     version: 1.0
-    repository: http://pkg.example.org/1/math
+    repository-url: http://pkg.example.org/1/math
+    repository-type: pkg
     machine: windows_10-msvc_14
     target: x86_64-microsoft-win32-msvc14.0
     EOF
@@ -36,7 +37,8 @@ test.options += -ts
     :
     name: libfoo
     version: 1.0
-    repository: http://pkg.example.org/1/math
+    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.test b/tests/manifest/task.test
index a835918..e3f413e 100644
--- a/tests/manifest/task.test
+++ b/tests/manifest/task.test
@@ -15,7 +15,8 @@ test.options += -t
   : 1
   name: libfoo
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  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
@@ -30,7 +31,8 @@ test.options += -t
   : 1
   name: libfoo
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-type: pkg
   machine: windows_10-msvc_14
   target: x86_64-microsoft-win32-msvc14.0
   EOF
@@ -44,7 +46,8 @@ test.options += -t
     : 1
     name: libfoo
     version: 1.0
-    repository: http://pkg.example.org/1/math
+    repository-url: http://pkg.example.org/1/math
+    repository-type: pkg
     machine: windows
     target: x86_64-microsoft-win32-msvc14.0
     config: abc=
@@ -56,7 +59,8 @@ test.options += -t
     : 1
     name: libfoo
     version: 1.0
-    repository: http://pkg.example.org/1/math
+    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="
@@ -69,7 +73,8 @@ test.options += -t
   : 1
   name: libfoo
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  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
@@ -98,10 +103,10 @@ test.options += -t
 
   : repository
   :
-  $* <<EOI 2>'stdin:3:1: error: task repository redefinition' == 1
+  $* <<EOI 2>'stdin:3:1: error: task repository URL redefinition' == 1
   : 1
-  repository: http://pkg.example.org/1/math
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
   EOI
 
   : machine
@@ -165,6 +170,33 @@ test.options += -t
     EOI
   }
 
+  : repository
+  :
+  {
+    : url
+    :
+    $* <<EOI 2>>EOE == 1
+    : 1
+    name: libfoo
+    version: 1.0
+    repository-url: http://pkg.example.org/math
+    repository-type: pkg
+    machine: windows_10-msvc_14
+    target: x86_64-microsoft-win32-msvc14.0
+    EOI
+    stdin:4:17: error: invalid task repository URL: missing repository version
+    EOE
+
+    : type
+    :
+    $* <<EOI 2>>EOE == 1
+    : 1
+    repository-type: svn
+    EOI
+    stdin:2:18: error: invalid task repository type 'svn'
+    EOE
+  }
+
   : machine-empty
   :
   $* <<EOI 2>'stdin:2:9: error: empty task machine' == 1
@@ -250,47 +282,62 @@ EOI
 {
   : name
   :
-  $* <<EOI 2>'stdin:5:1: error: no task package name specified' == 1
+  $* <<EOI 2>'stdin:6:1: error: no task package name specified' == 1
   : 1
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-type: pkg
   machine: windows_10-msvc_14
   EOI
 
   : version
   :
-  $* <<EOI 2>'stdin:5:1: error: no task package version specified' == 1
+  $* <<EOI 2>'stdin:6:1: error: no task package version specified' == 1
   : 1
   name: libfoo
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-type: pkg
   machine: windows_10-msvc_14
   EOI
 
-  : repository
+  : repository-url
+  :
+  $* <<EOI 2>'stdin:6:1: error: no task repository URL specified' == 1
+  : 1
+  name: libfoo
+  version: 1.0
+  machine: windows_10-msvc_14
+  repository-type: git
+  EOI
+
+  : repository-type
   :
-  $* <<EOI 2>'stdin:5:1: error: no task repository specified' == 1
+  $* <<EOI 2>'stdin:6:1: error: no task repository type specified' == 1
   : 1
   name: libfoo
   version: 1.0
+  repository-url: http://pkg.example.org/1/math
   machine: windows_10-msvc_14
   EOI
 
   : machine
   :
-  $* <<EOI 2>'stdin:5:1: error: no task machine specified' == 1
+  $* <<EOI 2>'stdin:6:1: error: no task machine specified' == 1
   : 1
   name: libfoo
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-type: pkg
   EOI
 
   : target
   :
-  $* <<EOI 2>'stdin:6:1: error: no task target specified' == 1
+  $* <<EOI 2>'stdin:7:1: error: no task target specified' == 1
   : 1
   name: libfoo
   version: 1.0
-  repository: http://pkg.example.org/1/math
+  repository-url: http://pkg.example.org/1/math
+  repository-type: pkg
   machine: windows_10-msvc_14
   EOI
 }