Add prefix, fix read (probably leaks..).

1 files changed, 22 insertions, 21 deletions

diff --git a/libvxi11client/perlbits/VXI11-Client.t b/libvxi11client/perlbits/VXI11-Client.t
index 31f3b1b..8ca167b 100644
--- a/libvxi11client/perlbits/VXI11-Client.t
+++ b/libvxi11client/perlbits/VXI11-Client.t
@@ -16,29 +16,30 @@ 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.
 
-&VXI11::Client::startinterruptserver();
+&VXI11::Client::vxi_startinterruptserver();
 
-my $instr = &VXI11::Client::open("roi", 0);
+my $instr = &VXI11::Client::vxi_open("roi", 0);
 
-is($instr->lock(0), 1, "Lock");
-ok($instr->write("*IDN?", -1, 0, 0) > 0, "Write");
+is($instr->vxi_lock(0), 1, "Lock");
+ok($instr->vxi_write("*IDN?", -1, 0, 0) > 0, "Write");
 
-my ($bytes, $buff) = $instr->read(256, 0, 0, 0);
+my ($bytes, $buff) = $instr->vxi_read(256, 0, 0, 0);
+print "got " . $bytes . ";" . $buff . "\n";
 ok($bytes > 0, "Read");
 
-ok($instr->readstatusbyte(0) >= 0 , "Read status byte");
-is($instr->create_intr_chan(), 1, "Create intr channel");
-is($instr->enable_srq(1, "myhandle"), 1, "Enable interrupts");
-is(&VXI11::Client::wait_for_interrupt, "myhandle", "Wait for interrupt");
-is($instr->enable_srq(0, ""), 1, "Disable interrupts");
-is($instr->destroy_intr_chan(), 1, "Destroy intr channel");
-is($instr->abort(), 1, "Abort");
-is($instr->clear(0), 1, "Clear");
-is($instr->trigger(0), 1, "Trigger");
-is($instr->local(0), 1, "Local");
-is($instr->remote(0), 1, "Remote");
-is($instr->unlock(), 1, "Unlock");
-
-is($instr->close(), 1, "Close");
-
-&VXI11::Client::stopinterruptserver();
+ok($instr->vxi_readstatusbyte(0) >= 0 , "Read status byte");
+is($instr->vxi_create_intr_chan(), 1, "Create intr channel");
+is($instr->vxi_enable_srq(1, "myhandle"), 1, "Enable interrupts");
+is(&VXI11::Client::vxi_wait_for_interrupt, "myhandle", "Wait for interrupt");
+is($instr->vxi_enable_srq(0, ""), 1, "Disable interrupts");
+is($instr->vxi_destroy_intr_chan(), 1, "Destroy intr channel");
+is($instr->vxi_abort(), 1, "Abort");
+is($instr->vxi_clear(0), 1, "Clear");
+is($instr->vxi_trigger(0), 1, "Trigger");
+is($instr->vxi_local(0), 1, "Local");
+is($instr->vxi_remote(0), 1, "Remote");
+is($instr->vxi_unlock(), 1, "Unlock");
+
+is($instr->vxi_close(), 1, "Close");
+
+&VXI11::Client::vxi_stopinterruptserver();