add more tests and a top level for perl wrapping

2 files changed, 16 insertions, 7 deletions

diff --git a/libvxi11client/perlbits/Makefile.PL b/libvxi11client/perlbits/Makefile.PL
index 801c91f..9b7f0ff 100644
--- a/libvxi11client/perlbits/Makefile.PL
+++ b/libvxi11client/perlbits/Makefile.PL
@@ -9,9 +9,9 @@ WriteMakefile(
     ($] >= 5.005 ?     ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM  => 'lib/VXI11/Client.pm', # retrieve abstract from module
        AUTHOR         => 'daniel <daniel@>') : ()),
-    LIBS              => [''], # e.g., '-lm'
+    LIBS              => ['-lgthread-2.0 -lrt -lglib-2.0'], # e.g., '-lm'
     DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
-    INC               => '-I.', # e.g., '-I. -I/usr/include/other'
+    INC               => '-I. -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include', # e.g., '-I. -I/usr/include/other'
     OBJECT            => '$(O_FILES)', # link all the C files too
 );
 if  (eval {require ExtUtils::Constant; 1}) {
diff --git a/libvxi11client/perlbits/VXI11-Client.t b/libvxi11client/perlbits/VXI11-Client.t
index de10ecf..4d68c37 100644
--- a/libvxi11client/perlbits/VXI11-Client.t
+++ b/libvxi11client/perlbits/VXI11-Client.t
@@ -8,7 +8,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 5;
+use Test::More tests => 12;
 BEGIN { use_ok('VXI11::Client') };
 
 #########################
@@ -16,7 +16,16 @@ BEGIN { use_ok('VXI11::Client') };
 # Insert your test code below, the Test::More module is use()ed here so read
 # its man page ( perldoc Test::More ) for help writing this test script.
 
-is(&VXI11::Client::vxi11_open("roi", 0), 1);
-is(&VXI11::Client::vxi11_lock(0), 1);
-is(&VXI11::Client::vxi11_unlock(), 1);
-is(&VXI11::Client::vxi11_close(), 1);
+is(&VXI11::Client::vopen("roi", 0), 1);
+is(&VXI11::Client::vlock(0), 1);
+is(&VXI11::Client::vwrite("*IDN?", 6, 0, 0), 6);
+ok(&VXI11::Client::vreadstatusbyte(0) >= 0 , "Read status byte");
+# is(&VXI11::Client::vcreate_intr_chan(), 1);
+# is(&VXI11::Client::vdestroy_intr_chan(), 1);
+is(&VXI11::Client::vabort(), 1);
+is(&VXI11::Client::vclear(0), 1);
+is(&VXI11::Client::vtrigger(0), 1);
+is(&VXI11::Client::vlocal(0), 1);
+is(&VXI11::Client::vremote(0), 1);
+is(&VXI11::Client::vunlock(), 1);
+is(&VXI11::Client::vclose(), 1);