poke at valgrind test

Author: bruceravel

c/test_valgrind.pl

@@ -2,9 +2,9 @@
 
 use strict;
 use warnings;
+use Test::More tests => 45;
 
-
-print "Testing good files\n";
+## good data
 foreach my $file (qw(co_metal_rt.xdi
 		     cu_metal_10K.xdi
 		     cu_metal_rt.xdi
@@ -23,28 +23,15 @@
 		   )) {
   my $command = "valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all ./xdi_reader ../baddata/$file 2>&1";
   my $x = `$command`;
-  printf "\t%-17s:  ", $file;
-  if ($x =~ m{All heap blocks were freed}) {
-    print "ok\n";
-  } else {
-    print "not ok\n";
-  };
-
+  ok(($x =~ m{All heap blocks were freed}), $file);
 };
 
-
-print "\nTesting bad files\n";
+## bad data
 foreach my $i (0 .. 29) {
   my $n = sprintf("%2.2d", $i);
   my $command = "valgrind --track-origins=yes --leak-check=full --show-leak-kinds=all ./xdi_reader ../baddata/bad_$n.xdi 2>&1";
-  #print $command, $/;
   my $x = `$command`;
-  printf "\tbad_%s.xdi:  ", $n;
-  if ($x =~ m{All heap blocks were freed}) {
-    print "ok\n";
-  } else {
-    print "not ok\n";
-  };
+  ok(($x =~ m{All heap blocks were freed}), "bad_$n.xdi");
 };
 
 

c/xdifile.c

@@ -18,7 +18,8 @@
 #include "xdifile.h"
 
 /* error string interpretation */
-_EXPORT(char*) XDI_errorstring(int errcode) {
+_EXPORT(char*)
+XDI_errorstring(int errcode) {
   if (errcode == 0) { return ""; }
   if (errcode == ERR_NOTXDI) {
     return "not an XDI file";
@@ -530,7 +531,8 @@ XDI_readfile(char *filename, XDIFile *xdifile) {
 
 }
 
-_EXPORT(int) XDI_get_array_index(XDIFile *xdifile, long n, double *out) {
+_EXPORT(int)
+XDI_get_array_index(XDIFile *xdifile, long n, double *out) {
   /* get array by index (starting at 0) from an XDIFile structure */
   long j;
   if (n < xdifile->narrays) {
@@ -542,7 +544,8 @@ _EXPORT(int) XDI_get_array_index(XDIFile *xdifile, long n, double *out) {
   return ERR_NOARR_INDEX;
 }
 
-_EXPORT(int) XDI_get_array_name(XDIFile *xdifile, char *name, double *out) {
+_EXPORT(int)
+XDI_get_array_name(XDIFile *xdifile, char *name, double *out) {
   /* get array by name from an XDIFile structure */
   long i;
   for (i = 0; i < xdifile->narrays; i++) {

perl/lib/Xray/XDI.pm

@@ -9,7 +9,9 @@ with 'MooseX::Clone';
 
 use List::MoreUtils qw(any uniq);
 
-our $VERSION = '1.00'; # Inline::MakeMake uses /^\d.\d\d$/ as the pattern for the version number -- note the two digits to the right of the dot
+our $VERSION = '1.00'; # Inline::MakeMake uses /^\d.\d\d$/ as the
+                       # pattern for the version number -- note the
+                       # two digits to the right of the dot
 
 has 'file' => (is => 'rw', isa => 'Str', traits => [qw(Clone)], default => q{},
 	       trigger => sub{$_[0]->_build_object});

perl/lib/Xray/XDIFile.pm

@@ -32,7 +32,7 @@ Xray::XDIFile - Inline::C interface to libxdifile
 =head1 SYNOPSIS
 
 This is a slight rewrite of the xdi_reader example that comes with the
-linxdifile source code.  It uses L<Inline> to map perl scalars onto
+libxdifile source code.  It uses L<Inline> to map perl scalars onto
 the data structures in libxdifile.
 
 Import an XDI file:
@@ -148,6 +148,10 @@ SV* new(char* class, char* file, SV* errcode) {
   return obj_ref;
 }
 
+void _cleanup(SV* obj, long err) {
+  XDI_cleanup((INT2PTR(XDIFile*, SvIV(SvRV(obj)))), err);
+}
+
 char* _errorstring(SV* obj, int code) {
   return XDI_errorstring(code);
 }