Skip to content

Commit

Permalink
CP-18271 remove OCaml code, use external rrdreader tool for testing
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
lindig committed Aug 9, 2016
1 parent b0d7513 commit 85747c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 112 deletions.
17 changes: 5 additions & 12 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# vim: set ts=8 sw=8 noet:
#
# To run the tests you need OCaml and the ocaml-rrd-transport-devel
# To run the integration tests you need the ocaml-rrd-transport-devel
# package:
#
# yum install -y ocaml-rrd-transport-devel
Expand Down Expand Up @@ -34,15 +34,15 @@ test: rrdtest rrdclient
seq 1 10 | ./rrdclient rrdclient.rrd

.PHONY: test-integration
test-integration: rrdreader
test-integration:
seq 1 10 | while read i; do \
echo $$i | ./rrdclient rrdclient.rrd ;\
./ocaml/rrdreader.native rrdclient.rrd ;\
rrdreader file --once rrdclient.rrd v2 ;\
done
seq 1 20 | while read i; do \
echo $$i | ./rrdclient rrdclient.rrd ;\
sleep 1 ;\
done & ./ocaml/rrdreader.native -l 2 rrdclient.rrd \
sleep 4 ;\
done & rrdreader file rrdclient.rrd v2 \
|| echo "a final exception Rrd_protocol.No_update is OK"

.PHONY: valgrind
Expand Down Expand Up @@ -98,10 +98,3 @@ parson/parson.o: parson/parson.h
rrdtest.o: parson/parson.h librrd.h
librrd.o: parson/parson.h librrd.h

# OCaml test utility
# You need: yum install -y ocaml-rrd-transport-devel

.PHONY: rrdreader
rrdreader:
cd ocaml; $(OCB) -pkgs rrd-transport,unix -tag thread rrdreader.native

100 changes: 0 additions & 100 deletions ocaml/rrdreader.ml

This file was deleted.

0 comments on commit 85747c7

Please sign in to comment.