Skip to content

Commit 85747c7

Browse files
committed
CP-18271 remove OCaml code, use external rrdreader tool for testing
The rrdreader tool has moved to the ocaml-rrd-transport 1.1.1 package on which we rely on anyway. This allows us to remove all OCaml code in this repository. Signed-off-by: Christian Lindig <[email protected]>
1 parent b0d7513 commit 85747c7

File tree

2 files changed

+5
-112
lines changed

2 files changed

+5
-112
lines changed

Makefile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# vim: set ts=8 sw=8 noet:
22
#
3-
# To run the tests you need OCaml and the ocaml-rrd-transport-devel
3+
# To run the integration tests you need the ocaml-rrd-transport-devel
44
# package:
55
#
66
# yum install -y ocaml-rrd-transport-devel
@@ -34,15 +34,15 @@ test: rrdtest rrdclient
3434
seq 1 10 | ./rrdclient rrdclient.rrd
3535

3636
.PHONY: test-integration
37-
test-integration: rrdreader
37+
test-integration:
3838
seq 1 10 | while read i; do \
3939
echo $$i | ./rrdclient rrdclient.rrd ;\
40-
./ocaml/rrdreader.native rrdclient.rrd ;\
40+
rrdreader file --once rrdclient.rrd v2 ;\
4141
done
4242
seq 1 20 | while read i; do \
4343
echo $$i | ./rrdclient rrdclient.rrd ;\
44-
sleep 1 ;\
45-
done & ./ocaml/rrdreader.native -l 2 rrdclient.rrd \
44+
sleep 4 ;\
45+
done & rrdreader file rrdclient.rrd v2 \
4646
|| echo "a final exception Rrd_protocol.No_update is OK"
4747

4848
.PHONY: valgrind
@@ -98,10 +98,3 @@ parson/parson.o: parson/parson.h
9898
rrdtest.o: parson/parson.h librrd.h
9999
librrd.o: parson/parson.h librrd.h
100100

101-
# OCaml test utility
102-
# You need: yum install -y ocaml-rrd-transport-devel
103-
104-
.PHONY: rrdreader
105-
rrdreader:
106-
cd ocaml; $(OCB) -pkgs rrd-transport,unix -tag thread rrdreader.native
107-

ocaml/rrdreader.ml

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

0 commit comments

Comments
 (0)