Get rid of special tracer database

The include, types, and pragma tests have been moved to the common/
directory while the object test has been merged into common/lifecycle.
The transaction test will be re-implemented as common/ test as soon
as SQL statement tracing support is merged.

7 files changed, 8 insertions, 60 deletions

diff --git a/dist.sh b/dist.sh
index df1b78f..f6a0fa7 100755
--- a/dist.sh
+++ b/dist.sh
@@ -101,7 +101,6 @@ if [ $rebuild = y ]; then
   rm -rf $out_root/libodb-pgsql/*
   rm -rf $out_root/libodb-sqlite/*
   rm -rf $out_root/libodb-mysql/*
-  rm -rf $out_root/libodb-tracer/*
   rm -rf $out_root/libodb-boost/*
   rm -rf $out_root/libodb-qt/*
   rm -rf $out_root/odb-tests/* $out_root/odb-tests-*
@@ -119,7 +118,6 @@ mkdir -p $out_root/libodb
 mkdir -p $out_root/libodb-pgsql
 mkdir -p $out_root/libodb-sqlite
 mkdir -p $out_root/libodb-mysql
-mkdir -p $out_root/libodb-tracer
 mkdir -p $out_root/libodb-boost
 mkdir -p $out_root/libodb-qt
 mkdir -p $out_root/odb-tests
@@ -247,27 +245,6 @@ cp $out_root/libodb-mysql/libodb-mysql-$ver.*.zip $out_root/pack/
 cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.gz $out_root/pack/
 cp $out_root/libodb-mysql/libodb-mysql-$ver.*.tar.bz2 $out_root/pack/
 
-# Build libodb-tracer
-#
-make -C `find_out_dir $src_root/libodb-tracer` \
--f $src_root/libodb-tracer/makefile dist dist_prefix=$out_root/libodb-tracer
-
-cd $out_root/libodb-tracer
-
-if [ $rebuild = y ]; then
-  ./bootstrap
-  ./configure --with-libodb=../libodb CXX=$cxx CXXFLAGS="$CXXFLAGS"
-fi
-
-make -j 8
-make dist
-
-cd $wd
-
-cp $out_root/libodb-tracer/libodb-tracer-$ver.*.zip $out_root/pack/
-cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.gz $out_root/pack/
-cp $out_root/libodb-tracer/libodb-tracer-$ver.*.tar.bz2 $out_root/pack/
-
 # Build libodb-boost
 #
 make -C `find_out_dir $src_root/libodb-boost` \
@@ -333,7 +310,6 @@ for d in $db; do
     ../odb-tests/configure \
 --with-database=$d \
 --with-libodb=../libodb \
---with-libodb-tracer=../libodb-tracer \
 --with-libodb-$d=../libodb-$d \
 --with-libodb-boost=../libodb-boost \
 --with-libodb-qt=../libodb-qt \
diff --git a/test/unix/build b/test/unix/build
index e6ebf22..009c88e 100755
--- a/test/unix/build
+++ b/test/unix/build
@@ -95,8 +95,8 @@ src=/tmp/pack
 v=`echo $src/libodb-?.*.tar.bz2 | sed -e "s%$src/libodb-\(.*\).tar.bz2%\1%"`
 cutl_v=`echo $src/../libcutl-?.*.tar.bz2 | sed -e "s%$src/\.\./libcutl-\(.*\).tar.bz2%\1%"`
 
-install_packs="libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-tracer \
-libodb-boost libodb-qt odb"
+install_packs="libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-boost \
+libodb-qt odb"
 
 packs=$install_packs
 
@@ -185,18 +185,6 @@ for d in $db; do
   cd ..
 done
 
-# Build libodb-tracer.
-#
-cd libodb-tracer
-
-if [ $rebuild = y -o ! -f Makefile ]; then
-  ./configure CXX=$cxx
-fi
-
-make -j $jobs
-sudo make install
-cd ..
-
 # Build libodb-boost.
 #
 cd libodb-boost
diff --git a/test/windows/README b/test/windows/README
index 1dc7244..b2ee0d3 100644
--- a/test/windows/README
+++ b/test/windows/README
@@ -24,9 +24,9 @@ Steps:
    boost
    qtcore
    odb/libodb
-   odb/libodb-tracer
-   odb/libodb-sqlite
    odb/libodb-mysql
+   odb/libodb-pgsql
+   odb/libodb-sqlite
    odb/libodb-boost
    odb/libodb-qt
 
diff --git a/test/windows/odb/build.bat b/test/windows/odb/build.bat
index 4169c36..ca97d9e 100755
--- a/test/windows/odb/build.bat
+++ b/test/windows/odb/build.bat
@@ -71,7 +71,7 @@ goto :eof
 
 :start
 
-for %%d in (libodb libodb-tracer libodb-%1 libodb-boost libodb-qt) do (
+for %%d in (libodb libodb-%1 libodb-boost libodb-qt) do (
   for %%c in (%confs%) do (
       for %%p in (%plats%) do (
         call :run_build %%d/%%d-vc%vcver%.sln %%c %%p
diff --git a/test/windows/odb/mingw/build b/test/windows/odb/mingw/build
index bf65db2..35748c9 100755
--- a/test/windows/odb/mingw/build
+++ b/test/windows/odb/mingw/build
@@ -72,7 +72,6 @@ if [ $rebuild = y ]; then
   clean libodb-pgsql
   clean libodb-sqlite
   clean libodb-mysql
-  clean libodb-tracer
   clean libodb-boost
   clean libodb-qt
 
@@ -106,17 +105,6 @@ for d in $db; do
   cd ..
 done
 
-# Build libodb-tracer
-#
-cd libodb-tracer
-
-if [ $rebuild = y -o ! -f Makefile ]; then
-  ./configure --with-libodb=../libodb CPPFLAGS="$CPPFLAGS" LDFLAGS="$LDFLAGS"
-fi
-
-make
-cd ..
-
 # Build libodb-boost
 #
 cd libodb-boost
@@ -152,7 +140,6 @@ for d in $db; do
 --with-database=$d \
 --with-libodb=../libodb \
 --with-libodb-$d=../libodb-$d \
---with-libodb-tracer=../libodb-tracer \
 --with-libodb-boost=../libodb-boost \
 --with-libodb-qt=../libodb-qt \
 ${!optvar} \
diff --git a/test/windows/odb/setenv.bat b/test/windows/odb/setenv.bat
index f346b59..dafba20 100755
--- a/test/windows/odb/setenv.bat
+++ b/test/windows/odb/setenv.bat
@@ -11,8 +11,8 @@ set QTCORE64=c:\projects\qtcore64
 set "DIFF=c:\cygwin\bin\diff.exe -ubB"
 rem set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
 set "DEVENV=c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
-set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-tracer\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%QTCORE%\bin;%PATH%
-set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-tracer\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%QTCORE64%\bin;%PATH%
+set PATH=%ODB%\libodb\bin;%ODB%\libodb-sqlite\bin;%ODB%\libodb-mysql\bin;%ODB%\libodb-pgsql\bin;%ODB%\libodb-boost\bin;%ODB%\libodb-qt\bin;%MYSQL%\bin;%SQLITE%\bin;%PGSQL%\bin;%QTCORE%\bin;%PATH%
+set PATH=%ODB%\libodb\bin64;%ODB%\libodb-sqlite\bin64;%ODB%\libodb-mysql\bin64;%ODB%\libodb-pgsql\bin64;%ODB%\libodb-boost\bin64;%ODB%\libodb-qt\bin64;%MYSQL64%\bin;%SQLITE%\bin64;%PGSQL64%\bin;%QTCORE64%\bin;%PATH%
 
 if "_%1_" == "__" goto end
 
diff --git a/test/windows/odb/unpack b/test/windows/odb/unpack
index eff9504..c45bd6c 100755
--- a/test/windows/odb/unpack
+++ b/test/windows/odb/unpack
@@ -34,7 +34,7 @@ else
   base=/cygdrive/t/pack
 fi
 
-rm -rf libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-tracer libodb-boost \
+rm -rf libodb libodb-pgsql libodb-sqlite libodb-mysql libodb-boost \
 libodb-qt odb odb-tests odb-examples odb-tests-* odb-examples-*
 
 v=`echo $base/libodb-?.*.zip | sed -e "s%$base/libodb-\(.*\).zip%\1%"`
@@ -44,9 +44,6 @@ echo unpacking $v from $base
 unzip -q $base/libodb-$v.zip
 mv libodb-$v libodb
 
-unzip -q $base/libodb-tracer-$v.zip
-mv libodb-tracer-$v libodb-tracer
-
 unzip -q $base/libodb-pgsql-$v.zip
 mv libodb-pgsql-$v libodb-pgsql