git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Security: Mitigate possible privilege escalation via SG_IO ioctl (CVE-2011-4127,...
[libguestfs.git]
/
resize
/
Makefile.am
diff --git
a/resize/Makefile.am
b/resize/Makefile.am
index
93a2600
..
c5d68e7
100644
(file)
--- a/
resize/Makefile.am
+++ b/
resize/Makefile.am
@@
-31,7
+31,8
@@
if HAVE_OCAML_PCRE
SOURCES = \
progress.ml \
resize.ml \
SOURCES = \
progress.ml \
resize.ml \
- utils.ml
+ utils.ml \
+ utils_tests.ml
# Note this list must be in dependency order.
OBJECTS = \
# Note this list must be in dependency order.
OBJECTS = \
@@
-78,6
+79,12
@@
CLEANFILES += stamp-virt-resize.pod
# Tests.
# Tests.
+check_SCRIPTS = utils_tests
+
+utils_tests: utils.cmx utils_tests.cmx
+ $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \
+ mlguestfs.cmxa -linkpkg $^ -cclib -lncurses -o $@
+
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
random_val := $(shell awk 'BEGIN{srand(); print 1+int(255*rand())}' < /dev/null)
TESTS_ENVIRONMENT = \
@@
-86,14
+93,15
@@
TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
-TESTS = test-virt-resize.sh
+TESTS = test-virt-resize.sh
utils_tests
# Dependencies.
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
# Dependencies.
depend: .depend
.depend: $(wildcard *.mli) $(wildcard *.ml)
rm -f $@ $@-t
- $(OCAMLFIND) ocamldep $(OCAMLPACKAGES) $^ | \
+ $(OCAMLFIND) ocamldep -I ../ocaml $^ | \
+ $(SED) 's/ *$$//' | \
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
sort > $@-t
mv $@-t $@
$(SED) -e :a -e '/ *\\$$/N; s/ *\\\n */ /; ta' | \
sort > $@-t
mv $@-t $@