Alex Nelson
2011-Oct-19 23:53 UTC
[Libguestfs] [hivex][PATCH 4/8] ocaml: Add unit test for new RLenValue type
Signed-off-by: Alex Nelson <ajnelson at cs.ucsc.edu>
---
.gitignore | 1 +
ocaml/Makefile.am | 1 +
ocaml/t/hivex_120_rlenvalue.ml | 42 ++++++++++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 0 deletions(-)
create mode 100644 ocaml/t/hivex_120_rlenvalue.ml
diff --git a/.gitignore b/.gitignore
index 40a4780..9c17ac6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,6 +67,7 @@ ocaml/t/hivex_010_open
ocaml/t/hivex_020_root
ocaml/t/hivex_100_errors
ocaml/t/hivex_110_gc_handle
+ocaml/t/hivex_120_rlenvalue
ocaml/t/hivex_200_write
ocaml/t/hivex_300_fold
perl/blib
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index ca4c111..eb49431 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -59,6 +59,7 @@ TESTS = \
t/hivex_020_root \
t/hivex_100_errors \
t/hivex_110_gc_handle \
+ t/hivex_120_rlenvalue \
t/hivex_200_write \
t/hivex_300_fold
noinst_DATA += $(TESTS)
diff --git a/ocaml/t/hivex_120_rlenvalue.ml b/ocaml/t/hivex_120_rlenvalue.ml
new file mode 100644
index 0000000..310c5b9
--- /dev/null
+++ b/ocaml/t/hivex_120_rlenvalue.ml
@@ -0,0 +1,42 @@
+(* hivex OCaml bindings
+ * Copyright (C) 2009-2010 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *)
+
+(* Demonstrate value_data_cell_offset by looking at the value at
+ * "\$$$\PROTO.HIV\A\A", verified to be at file offset 297680
(0x48ad0)
+ * of the large test hive. The returned offset and length for this
+ * value cell should be 0,0, due to the value data being inline.
+ *)
+
+
+open Unix
+open Printf
+let (//) = Filename.concat
+
+let () + let h = Hivex.open_file ("../images/large") [] in
+ let (data_off, data_len) = Hivex.value_data_cell_offset h (Obj.magic
297680:Hivex.value) in
+ let check_off = assert (data_off == (Obj.magic 0:Hivex.value)) in
+ let check_len = assert (data_len == 0) in
+ printf "Offset and length of value data for value metadata at offset
297680 is %d, %d.\n" (Obj.magic data_off:int) (Obj.magic data_len:int);
+
+ Hivex.close h;
+
+ (* Gc.compact is a good way to ensure we don't have
+ * heap corruption or double-freeing.
+ *)
+ Gc.compact ()
--
1.7.4.4
Richard W.M. Jones
2011-Oct-20 11:42 UTC
[Libguestfs] [hivex][PATCH 4/8] ocaml: Add unit test for new RLenValue type
On Wed, Oct 19, 2011 at 04:53:36PM -0700, Alex Nelson wrote: [...]> +let () > + let h = Hivex.open_file ("../images/large") [] inYou don't need to put parens around the string.> + let (data_off, data_len) = Hivex.value_data_cell_offset h (Obj.magic 297680:Hivex.value) inYou can if you want omit the parens around (data_off, data_len), although it is a matter of preference.> + let check_off = assert (data_off == (Obj.magic 0:Hivex.value)) in > + let check_len = assert (data_len == 0) inAssigning these values is useless. 'assert' doesn't return anything (or to be very strict, it returns a unit value). If assert fails, it throws an exception and the program quits. So just drop the whole 'let ... = [...] in' bit and just have the assert.> + printf "Offset and length of value data for value metadata at offset 297680 is %d, %d.\n" (Obj.magic data_off:int) (Obj.magic data_len:int);Best not to print anything in tests. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones New in Fedora 11: Fedora Windows cross-compiler. Compile Windows programs, test, and build Windows installers. Over 70 libraries supprt'd http://fedoraproject.org/wiki/MinGW http://www.annexia.org/fedora_mingw
Maybe Matching Threads
- [hivex] [PATCH 4/8] ocaml: Add unit test for new RLenValue type
- [PATCH] Don't rely on OCaml native compiler for tests
- hivex: Test failure for Perl, OCaml, Python bindings on sparc
- [hivex][PATCH 7/8] ruby: Add unit test for new RLenValue type
- [hivex] [PATCH 7/8] ruby: Add unit test for new RLenValue type