Skip to content

Commit

Permalink
update other shim tests to use correct library version
Browse files Browse the repository at this point in the history
  • Loading branch information
petersilva committed Jul 24, 2024
1 parent 0a6b18d commit 95d1904
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 12 deletions.
7 changes: 5 additions & 2 deletions shim_copy_baseDir.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`


# job step 0 - setup...
if [ ! -d ~/test ]; then
Expand Down Expand Up @@ -97,9 +100,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0:`pwd`/libsr3c.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}:`pwd`/libsr3c.so.${VERSION}
#export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down
7 changes: 5 additions & 2 deletions shim_copy_flatten.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`


# job step 0 - setup...
if [ ! -d ~/test ]; then
Expand Down Expand Up @@ -95,9 +98,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}
export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down
7 changes: 5 additions & 2 deletions shim_copy_mirror.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@


VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`

# job step 0 - setup...
if [ ! -d ~/test ]; then
mkdir ~/test
Expand Down Expand Up @@ -98,9 +101,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}
export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down
7 changes: 5 additions & 2 deletions shim_copy_mirror_sftp.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`


# job step 0 - setup...
if [ ! -d ~/test ]; then
Expand Down Expand Up @@ -94,9 +97,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}
export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down
7 changes: 5 additions & 2 deletions shim_copy_strip.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`


# job step 0 - setup...
if [ ! -d ~/test ]; then
Expand Down Expand Up @@ -108,9 +111,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}
export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down
7 changes: 5 additions & 2 deletions shim_copy_strip_slash.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@

VERSION=`head -1 debian/changelog| sed 's/.*(//' | sed 's/).*//'`
MAJOR_VERSION=`echo \"${VERSION}\" | sed 's+\..*++g'`


# job step 0 - setup...
if [ ! -d ~/test ]; then
Expand Down Expand Up @@ -101,9 +104,9 @@ sr3 start subscribe/local_copy.conf

export SR_POST_CONFIG=local_post.conf
if [ "${SYSTEM_SHIM_TEST}" ]; then
export LD_PRELOAD=libsr3shim.so.1.0.0
export LD_PRELOAD=libsr3shim.so.${VERSION}
else
export LD_PRELOAD=`pwd`/libsr3shim.so.1.0.0:`pwd`/libsr3c.so.1.0.0
export LD_PRELOAD=`pwd`/libsr3shim.so.${VERSION}:`pwd`/libsr3c.so.${VERSION}
#export LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
fi
export SR_SHIMDEBUG=99
Expand Down

0 comments on commit 95d1904

Please sign in to comment.