lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-12-21 11:00:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put unixODBC under basic build / test coverage

Browse Source
This commit is contained in:
Evan Miller
2020-08-11 11:56:08 -04:00
parent 71e10395fd
commit f7e863b8e4
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -17,15 +17,17 @@ addons:
apt: apt:
packages: packages:
- libiodbc2-dev - libiodbc2-dev
- unixodbc-dev
homebrew: homebrew:
packages: packages:
- libiodbc - libiodbc
- unixodbc
before_script: before_script:
- autoreconf -i -f -Wno-portability - autoreconf -i -f -Wno-portability
script: script:
- ./configure --disable-man --disable-silent-rules --disable-glib --with-iodbc=/usr - ./configure --disable-man --disable-silent-rules --disable-glib
- make - make
- ./src/util/mdb-array test/data/ASampleDatabase.accdb "Asset Items" - ./src/util/mdb-array test/data/ASampleDatabase.accdb "Asset Items"
- ./src/util/mdb-array test/data/nwind.mdb "Customers" - ./src/util/mdb-array test/data/nwind.mdb "Customers"
@@ -39,4 +41,11 @@ script:
- ./src/util/mdb-tables test/data/nwind.mdb - ./src/util/mdb-tables test/data/nwind.mdb
- ./src/util/mdb-ver test/data/ASampleDatabase.accdb - ./src/util/mdb-ver test/data/ASampleDatabase.accdb
- ./src/util/mdb-ver test/data/nwind.mdb - ./src/util/mdb-ver test/data/nwind.mdb
- make clean
- ./configure --disable-man --disable-silent-rules --disable-glib --with-iodbc=/usr
- make
- env MDBPATH=test/data ./src/odbc/unittest
- make clean
- ./configure --disable-man --disable-silent-rules --disable-glib --with-unixodbc=/usr
- make
- env MDBPATH=test/data ./src/odbc/unittest - env MDBPATH=test/data ./src/odbc/unittest

5
configure.ac
View File

@@ -120,6 +120,11 @@ if test "$with_unixodbc"; then
ODBC_LIBS="-L$with_unixodbc/lib" ODBC_LIBS="-L$with_unixodbc/lib"
CFLAGS="$CFLAGS -DUNIXODBC" CFLAGS="$CFLAGS -DUNIXODBC"
dnl SIZEOF_LONG_INT and HAVE_LONG_LONG are required by some versions of unixODBC
dnl https://github.com/lurcher/unixODBC/issues/40
AC_CHECK_SIZEOF([long int])
AC_CHECK_TYPES([long long])
OLDLDFLAGS=$LDFLAGS OLDLDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $ODBC_LIBS" LDFLAGS="$LDFLAGS $ODBC_LIBS"
AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString, AC_CHECK_LIB(odbcinst, SQLGetPrivateProfileString,