Skip to content

Commit 9e1cdad

Browse files
authored
Merge pull request xapi-project#49 from psafont/travis
CP-33121: run encodings tests as part of the encodings package
2 parents 4fa7ced + 10edcba commit 9e1cdad

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ install:
99
script: bash -ex .travis-docker.sh
1010
env:
1111
global:
12-
- PACKAGE="xapi-stdext"
13-
- PINS="stdext:. xapi-stdext:. xapi-stdext-date:. xapi-stdext-encodings:. xapi-stdext-pervasives:. xapi-stdext-std:. xapi-stdext-threads:. xapi-stdext-unix:. xapi-stdext-zerocheck:."
12+
- PINS="stdext:. xapi-stdext-date:. xapi-stdext-encodings:. xapi-stdext-pervasives:. xapi-stdext-std:. xapi-stdext-threads:. xapi-stdext-unix:. xapi-stdext-zerocheck:."
13+
jobs:
14+
- PACKAGE="stdext"
15+
- PACKAGE="xapi-stdext-encodings"

lib_test/dune

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
(executable
2-
(name suite)
1+
(test
2+
(name test_encodings)
3+
(package xapi-stdext-encodings)
34
(libraries
45
alcotest
56
xapi_stdext_encodings
6-
xapi_stdext_date)
7-
)
8-
9-
(alias
10-
(name runtest)
11-
(deps (:x suite.exe))
12-
(action (run %{x}))
7+
xapi-stdext-date)
138
)

lib_test/suite.ml

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib_test/test_encodings.ml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,3 +575,7 @@ let tests =
575575
XML_UTF8_UCS_validator.tests @
576576
UTF8_codec .tests @
577577
Date .tests
578+
let () =
579+
Alcotest.run
580+
"suite"
581+
[ "Test_encodings", tests ]

stdext.opam

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@ depends: [
1212
"ocaml"
1313
"dune" {build}
1414
"xapi-stdext-date"
15-
"xapi-stdext-deprecated"
1615
"xapi-stdext-encodings"
1716
"xapi-stdext-pervasives"
18-
"xapi-stdext-range"
1917
"xapi-stdext-std"
2018
"xapi-stdext-threads"
2119
"xapi-stdext-unix"

xapi-stdext-encodings.opam

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ dev-repo: "git://github.com/xapi-project/stdext.git"
66
homepage: "https://xapi-project.github.io/"
77
tags: [ "org:xapi-project" ]
88

9-
build: [[ "dune" "build" "-p" name "-j" jobs ]]
9+
build: [
10+
[ "dune" "build" "-p" name "-j" jobs ]
11+
[ "dune" "runtest" "-p" name "-j" jobs ] {with-test}
12+
]
1013

1114
depends: [
1215
"ocaml"
1316
"dune" {build}
17+
"alcotest" {with-test}
18+
"xapi-stdext-date" {with-test}
1419
]
1520
synopsis: "A deprecated collection of utility functions - Encodings module"
1621
description: """

0 commit comments

Comments
 (0)