More structural changes to get ready for stand-alone event engines

9 files changed, 17 insertions, 12 deletions

diff --git a/tests/grab.sh b/tests/grab.sh
index daf142e..daa08c1 100755
--- a/tests/grab.sh
+++ b/tests/grab.sh
@@ -1,8 +1,8 @@
 #! /bin/bash
 
 function pci {
-    PCILIB_PATH="/root/pcitool"
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci $*
+    PCILIB_PATH=".."
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
 }
 
 rm -f images.raw
diff --git a/tests/ipedma/ipecamera-frame.sh b/tests/ipedma/ipecamera-frame.sh
index 9862432..5e72c6c 100755
--- a/tests/ipedma/ipecamera-frame.sh
+++ b/tests/ipedma/ipecamera-frame.sh
@@ -5,7 +5,7 @@ TESTS_PATH="`( cd \"$TESTS_PATH\" && pwd )`"
 
 function pci {
     PCILIB_PATH=$TESTS_PATH/../..
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci -m ipedma $*
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci -m ipedma $*
 }
 
 
diff --git a/tests/ipedma/ipecamera-test.sh b/tests/ipedma/ipecamera-test.sh
index 3984c82..cd21391 100755
--- a/tests/ipedma/ipecamera-test.sh
+++ b/tests/ipedma/ipecamera-test.sh
@@ -4,7 +4,7 @@ size=65536
 
 function pci {
     PCILIB_PATH=`pwd`/../..
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci -m ipedma $*
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci -m ipedma $*
 }
 
 
diff --git a/tests/ipedma/test.sh b/tests/ipedma/test.sh
index 4054f8a..62c391a 100755
--- a/tests/ipedma/test.sh
+++ b/tests/ipedma/test.sh
@@ -4,7 +4,7 @@ size=65536
 
 function pci {
     PCILIB_PATH=`pwd`/../..
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci -m ipedma $*
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci -m ipedma $*
 }
 
 
diff --git a/tests/nwldma/bench.sh b/tests/nwldma/bench.sh
index b36c251..d0bf323 100755
--- a/tests/nwldma/bench.sh
+++ b/tests/nwldma/bench.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 function pci {
-    PCILIB_PATH="/root/pcitool"
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci $*
+    PCILIB_PATH="../.."
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
 }
 
 size=16
diff --git a/tests/nwldma/cleanup.sh b/tests/nwldma/cleanup.sh
index 5ef568e..87e1517 100755
--- a/tests/nwldma/cleanup.sh
+++ b/tests/nwldma/cleanup.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 function pci {
-    PCILIB_PATH="/root/pcitool"
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci $*
+    PCILIB_PATH="../.."
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
 }
 
 pci --start-dma dma1r
diff --git a/tests/test-iommu.sh b/tests/test-iommu.sh
index 74e3ece..5a5924b 100755
--- a/tests/test-iommu.sh
+++ b/tests/test-iommu.sh
@@ -1,5 +1,10 @@
 #! /bin/bash
 
+function pci {
+    PCILIB_PATH=".."
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
+}
+
 i=1
 while [ 1 ]; do
     pci --start-dma dma1r
diff --git a/tests/xilinxdma/xilinx_dma.sh b/tests/xilinxdma/xilinx_dma.sh
index 6aada8b..4fedac3 100755
--- a/tests/xilinxdma/xilinx_dma.sh
+++ b/tests/xilinxdma/xilinx_dma.sh
@@ -6,8 +6,8 @@ ITERATIONS=2
 BUFFERS=16
 
 function pci {
-    PCILIB_PATH=`pwd`/..
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci $*
+    PCILIB_PATH=`pwd`/../..
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
 }
 
 
diff --git a/tests/xilinxdma/xilinx_dma_static_mem.sh b/tests/xilinxdma/xilinx_dma_static_mem.sh
index e3ba0f5..23ee5c9 100755
--- a/tests/xilinxdma/xilinx_dma_static_mem.sh
+++ b/tests/xilinxdma/xilinx_dma_static_mem.sh
@@ -8,7 +8,7 @@ BUFFER_SIZE=8
 
 function pci {
     PCILIB_PATH=`pwd`/..
-    LD_LIBRARY_PATH="$PCILIB_PATH" $PCILIB_PATH/pci $*
+    LD_LIBRARY_PATH="$PCILIB_PATH/pcilib" $PCILIB_PATH/pcitool/pci $*
 }