Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
> -- Original Message -- > From: Landry Breuil > Date: November 14, 2019 at 3:21 AM > > Does this mean you're going to update/maintain this port again ? :) > > Landry Yes. Stu
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
On Thu, Nov 14, 2019 at 12:31:37AM -0500, 3...@bell.net wrote: > Also I don't think this needs to be forced to build against 8.6. Running the tests require 8.6 - and honestly, i'm only interested in running the tests. > Sorry for all the messages, I'm just coming back after almost 2 years > away ... whatever that means. Does this mean you're going to update/maintain this port again ? :) Landry
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
Please keep them separate. Much easier to update either. If they were tied together and I wanted to update tcl-sqlite I'd have to spend a week testing and convincing. Also, tcl-sqlite isn't built with the same options as the main sqlite port. The tests would be nice but I'm not sure you're going down the right path; the amalgamation build is really the only sensible and mostly-guaranteed-to-work way to build sqlite. Stu -- Original Message -- From: Landry Breuil Date: November 9, 2019 at 9:55 AM Hi, sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im pondering moving back to the previous situation of having them as a single port with multipackages (which was the case before sqlite3 got imported into base) - and while here i hacked my way around to be able to run the tcl test suite. Right now its still running (and seems hung) but that allows to run those natively for each updates. - we need to switch to the -src tarball which is the only one containing tests - that requires horrible hacks to generate configure in the autoconf/tea subdir, + generate tclsqlite3.c wrapper. - that means rerunning configure/building in do-test as the WRKDIST dir changes so its a gross hack, more an interesting exercise in ports wrestling, but finally having sqlite tests. even if it doesnt build with the same options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices look rather arbitrary. stu, an opinion about keeping it separate or not ? Landry
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
"some of the SQLITE_ENABLE_XX choices look rather arbitrary." Actually I spent some time carefully poring through all the options so I could provide the best sqlite possible for Tcl. Yeah, so separate please. Stu -- Original Message -- From: Landry Breuil Date: November 9, 2019 at 9:55 AM Hi, sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im pondering moving back to the previous situation of having them as a single port with multipackages (which was the case before sqlite3 got imported into base) - and while here i hacked my way around to be able to run the tcl test suite. Right now its still running (and seems hung) but that allows to run those natively for each updates. - we need to switch to the -src tarball which is the only one containing tests - that requires horrible hacks to generate configure in the autoconf/tea subdir, + generate tclsqlite3.c wrapper. - that means rerunning configure/building in do-test as the WRKDIST dir changes so its a gross hack, more an interesting exercise in ports wrestling, but finally having sqlite tests. even if it doesnt build with the same options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices look rather arbitrary. stu, an opinion about keeping it separate or not ? Landry
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
Also I don't think this needs to be forced to build against 8.6. Sorry for all the messages, I'm just coming back after almost 2 years away ... whatever that means. Stu -- Original Message -- From: Landry Breuil Date: November 9, 2019 at 9:55 AM Hi, sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im pondering moving back to the previous situation of having them as a single port with multipackages (which was the case before sqlite3 got imported into base) - and while here i hacked my way around to be able to run the tcl test suite. Right now its still running (and seems hung) but that allows to run those natively for each updates. - we need to switch to the -src tarball which is the only one containing tests - that requires horrible hacks to generate configure in the autoconf/tea subdir, + generate tclsqlite3.c wrapper. - that means rerunning configure/building in do-test as the WRKDIST dir changes so its a gross hack, more an interesting exercise in ports wrestling, but finally having sqlite tests. even if it doesnt build with the same options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices look rather arbitrary. stu, an opinion about keeping it separate or not ? Landry
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
On Sun Nov 10, 2019 at 10:37:07AM +0100, Landry Breuil wrote:
> On Sun, Nov 10, 2019 at 10:13:38AM +0100, Landry Breuil wrote:
> > On Sat, Nov 09, 2019 at 03:55:18PM +0100, Landry Breuil wrote:
> > > Hi,
> > >
> > > sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im
> > > pondering moving back to the previous situation of having them as a
> > > single port with multipackages (which was the case before sqlite3 got
> > > imported into base) - and while here i hacked my way around to be able
> > > to run the tcl test suite. Right now its still running (and seems hung)
> > > but that allows to run those natively for each updates.
> > >
> > > - we need to switch to the -src tarball which is the only one containing
> > > tests
> > > - that requires horrible hacks to generate configure in the autoconf/tea
> > > subdir, + generate tclsqlite3.c wrapper.
> > > - that means rerunning configure/building in do-test as the WRKDIST dir
> > > changes
> > >
> > > so its a gross hack, more an interesting exercise in ports wrestling,
> > > but finally having sqlite tests. even if it doesnt build with the same
> > > options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices
> > > look rather arbitrary.
> >
> > And the resulting libsqlite3 tcl library is actually completely broken,
> > so yeah its a gross hack. But that said, i managed to run the complete
> > tcl testsuite, which resulted after smth like 7h in not so bad results:
> >
> > SQLite 2019-10-10 20:19:45
> > 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3dfalt1
> >
> > 13 errors out of 313 tests on c64.proxmox2 OpenBSD 64-bit little-endian
> >
> > !Failures on these tests: backup2-10 loadext-2.1 loadext-2.2 loadext-2.3
> > loadext-3.2 sort3-3 memsubsys1.backup2-10 memsubsys2.backup2-10
> > no_mutex_try.backup2-10 journaltest.backup2-10 inmemory_journal.backup2-10
> > prepare.backup2-10 mm-backup2-10
> >
> > (and i think the failures are not actual failures)
> >
> > so still, this *might* be interesting to be able to run those tests
> > somehow, so
> > that one updating sqlite3 can be a bit more comfortable with testing.
>
> And now a much better version that produces a working tcl sqlite library
> (tested by running tdbc-sqlite3 tests) *and* running tests. Went the
> simpler route by adding the complete -src tarball as an additional
> distfile, and building/running tests from its source dir. A bit gross,
> but works.
>
> Now, opinions ? Yays/Nays ? General apathy on the subject ?
The test suite is a big benefit for porting new updates. Any objection
to switch HOMEPAGE to HTTPS?
>
> Landry
> ? Makefile.oot
> ? sqlite3-tcl-3.30.1-with-tests.diff
> ? pkg/PLIST.new
> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/sqlite3-tcl/Makefile,v
> retrieving revision 1.10
> diff -u -r1.10 Makefile
> --- Makefile 12 Jul 2019 20:44:02 - 1.10
> +++ Makefile 10 Nov 2019 09:34:10 -
> @@ -2,10 +2,11 @@
>
> COMMENT =Tcl bindings for SQLite3
>
> -V = 3.24.0
> +V = 3.30.1
> VER =${V:S/.//g}
>
> DISTNAME = sqlite-autoconf-${VER:C/.$/0\0/}00
> +DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
> sqlite-src-${VER:C/.$/0\0/}00.zip
> PKGNAME =sqlite3-tcl-${V}
> CATEGORIES = databases
> HOMEPAGE = http://www.sqlite.org/
> @@ -16,11 +17,12 @@
>
> WANTLIB =pthread
>
> -MASTER_SITES = ${HOMEPAGE}2018/
> +MASTER_SITES = ${HOMEPAGE}2019/
>
> MODULES =lang/tcl
> BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
> RUN_DEPENDS =${MODTCL_RUN_DEPENDS}
> +MODTCL_VERSION = 8.6
>
> FAKE_FLAGS = PKG_DIR=sqlite3
> SEPARATE_BUILD = Yes
> @@ -29,8 +31,6 @@
> CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \
> --libdir=${MODTCL_TCLDIR}
>
> -NO_TEST =Yes
> -
> CFLAGS +=-DSQLITE_ENABLE_COLUMN_METADATA=1 \
> -DSQLITE_ENABLE_DBSTAT_VTAB=1 \
> -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \
> @@ -47,5 +47,12 @@
>
> WRKSRC = ${WRKDIST}/tea
> SUBST_VARS = VER
> +
> +do-test:
> + sed -i -e 's#editline/readline.h#readline/readline.h#'
> ${WRKDIR}/sqlite-src-${VER:C/.$/0\0/}00/src/shell.c.in
> + cd ${WRKDIR}/sqlite-src-${VER:C/.$/0\0/}00 && \
> + ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && \
> + ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} fulltest
> +
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/sqlite3-tcl/distinfo,v
> retrieving revision 1.7
> diff -u -r1.7 distinfo
> --- distinfo 25 Jun 2018 17:47:01 - 1.7
> +++ distinfo 10 Nov 2019 09:34:10 -
>
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
On Sun, Nov 10, 2019 at 10:13:38AM +0100, Landry Breuil wrote:
> On Sat, Nov 09, 2019 at 03:55:18PM +0100, Landry Breuil wrote:
> > Hi,
> >
> > sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im
> > pondering moving back to the previous situation of having them as a
> > single port with multipackages (which was the case before sqlite3 got
> > imported into base) - and while here i hacked my way around to be able
> > to run the tcl test suite. Right now its still running (and seems hung)
> > but that allows to run those natively for each updates.
> >
> > - we need to switch to the -src tarball which is the only one containing
> > tests
> > - that requires horrible hacks to generate configure in the autoconf/tea
> > subdir, + generate tclsqlite3.c wrapper.
> > - that means rerunning configure/building in do-test as the WRKDIST dir
> > changes
> >
> > so its a gross hack, more an interesting exercise in ports wrestling,
> > but finally having sqlite tests. even if it doesnt build with the same
> > options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices
> > look rather arbitrary.
>
> And the resulting libsqlite3 tcl library is actually completely broken,
> so yeah its a gross hack. But that said, i managed to run the complete
> tcl testsuite, which resulted after smth like 7h in not so bad results:
>
> SQLite 2019-10-10 20:19:45
> 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3dfalt1
>
> 13 errors out of 313 tests on c64.proxmox2 OpenBSD 64-bit little-endian
>
> !Failures on these tests: backup2-10 loadext-2.1 loadext-2.2 loadext-2.3
> loadext-3.2 sort3-3 memsubsys1.backup2-10 memsubsys2.backup2-10
> no_mutex_try.backup2-10 journaltest.backup2-10 inmemory_journal.backup2-10
> prepare.backup2-10 mm-backup2-10
>
> (and i think the failures are not actual failures)
>
> so still, this *might* be interesting to be able to run those tests somehow,
> so
> that one updating sqlite3 can be a bit more comfortable with testing.
And now a much better version that produces a working tcl sqlite library
(tested by running tdbc-sqlite3 tests) *and* running tests. Went the
simpler route by adding the complete -src tarball as an additional
distfile, and building/running tests from its source dir. A bit gross,
but works.
Now, opinions ? Yays/Nays ? General apathy on the subject ?
Landry
? Makefile.oot
? sqlite3-tcl-3.30.1-with-tests.diff
? pkg/PLIST.new
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlite3-tcl/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile12 Jul 2019 20:44:02 - 1.10
+++ Makefile10 Nov 2019 09:34:10 -
@@ -2,10 +2,11 @@
COMMENT = Tcl bindings for SQLite3
-V =3.24.0
+V =3.30.1
VER = ${V:S/.//g}
DISTNAME = sqlite-autoconf-${VER:C/.$/0\0/}00
+DISTFILES =${DISTNAME}${EXTRACT_SUFX}
sqlite-src-${VER:C/.$/0\0/}00.zip
PKGNAME = sqlite3-tcl-${V}
CATEGORIES = databases
HOMEPAGE = http://www.sqlite.org/
@@ -16,11 +17,12 @@
WANTLIB = pthread
-MASTER_SITES = ${HOMEPAGE}2018/
+MASTER_SITES = ${HOMEPAGE}2019/
MODULES = lang/tcl
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
+MODTCL_VERSION = 8.6
FAKE_FLAGS = PKG_DIR=sqlite3
SEPARATE_BUILD = Yes
@@ -29,8 +31,6 @@
CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR}
-NO_TEST = Yes
-
CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_ENABLE_DBSTAT_VTAB=1 \
-DSQLITE_ENABLE_EXPLAIN_COMMENTS=1 \
@@ -47,5 +47,12 @@
WRKSRC = ${WRKDIST}/tea
SUBST_VARS = VER
+
+do-test:
+ sed -i -e 's#editline/readline.h#readline/readline.h#'
${WRKDIR}/sqlite-src-${VER:C/.$/0\0/}00/src/shell.c.in
+ cd ${WRKDIR}/sqlite-src-${VER:C/.$/0\0/}00 && \
+ ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} fulltest
+
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlite3-tcl/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo25 Jun 2018 17:47:01 - 1.7
+++ distinfo10 Nov 2019 09:34:10 -
@@ -1,2 +1,4 @@
-SHA256 (sqlite-autoconf-324.tar.gz) =
2dFOiMb7bWjenKDR+Xl0d9gvw67WE1WPh/+9u8XOt0o=
-SIZE (sqlite-autoconf-324.tar.gz) = 2699252
+SHA256 (sqlite-autoconf-3300100.tar.gz) =
jFpQ2wib0qGwjbxbANICdgLKf/I4unZY+rykVNQpjmA=
+SHA256 (sqlite-src-3300100.zip) = RpA3BzcYkUnJ6DREFKo3H4mnDjdEujF87xpJ+w7oHOE=
+SIZE (sqlite-autoconf-3300100.tar.gz) =
Re: [poc][wip] sqlite3-tcl 3.30.1 + enable tests
On Sat, Nov 09, 2019 at 03:55:18PM +0100, Landry Breuil wrote: > Hi, > > sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im > pondering moving back to the previous situation of having them as a > single port with multipackages (which was the case before sqlite3 got > imported into base) - and while here i hacked my way around to be able > to run the tcl test suite. Right now its still running (and seems hung) > but that allows to run those natively for each updates. > > - we need to switch to the -src tarball which is the only one containing > tests > - that requires horrible hacks to generate configure in the autoconf/tea > subdir, + generate tclsqlite3.c wrapper. > - that means rerunning configure/building in do-test as the WRKDIST dir > changes > > so its a gross hack, more an interesting exercise in ports wrestling, > but finally having sqlite tests. even if it doesnt build with the same > options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices > look rather arbitrary. And the resulting libsqlite3 tcl library is actually completely broken, so yeah its a gross hack. But that said, i managed to run the complete tcl testsuite, which resulted after smth like 7h in not so bad results: SQLite 2019-10-10 20:19:45 18db032d058f1436ce3dea84081f4ee5a0f2259ad97301d43c426bc7f3dfalt1 13 errors out of 313 tests on c64.proxmox2 OpenBSD 64-bit little-endian !Failures on these tests: backup2-10 loadext-2.1 loadext-2.2 loadext-2.3 loadext-3.2 sort3-3 memsubsys1.backup2-10 memsubsys2.backup2-10 no_mutex_try.backup2-10 journaltest.backup2-10 inmemory_journal.backup2-10 prepare.backup2-10 mm-backup2-10 (and i think the failures are not actual failures) so still, this *might* be interesting to be able to run those tests somehow, so that one updating sqlite3 can be a bit more comfortable with testing. Landry
[poc][wip] sqlite3-tcl 3.30.1 + enable tests
Hi,
sqlite3-tcl is a bit outdated compared to 'main' sqlite3, so im
pondering moving back to the previous situation of having them as a
single port with multipackages (which was the case before sqlite3 got
imported into base) - and while here i hacked my way around to be able
to run the tcl test suite. Right now its still running (and seems hung)
but that allows to run those natively for each updates.
- we need to switch to the -src tarball which is the only one containing
tests
- that requires horrible hacks to generate configure in the autoconf/tea
subdir, + generate tclsqlite3.c wrapper.
- that means rerunning configure/building in do-test as the WRKDIST dir
changes
so its a gross hack, more an interesting exercise in ports wrestling,
but finally having sqlite tests. even if it doesnt build with the same
options as the main sqlite3 port.. some of the SQLITE_ENABLE_XX choices
look rather arbitrary.
stu, an opinion about keeping it separate or not ?
Landry
? Makefile.oot
? patch-tea_configure
? sqlite3-tcl-3.30.1-with-tests.diff
? pkg/PLIST.new
Index: Makefile
===
RCS file: /cvs/ports/databases/sqlite3-tcl/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile12 Jul 2019 20:44:02 - 1.10
+++ Makefile9 Nov 2019 14:50:22 -
@@ -2,11 +2,12 @@
COMMENT = Tcl bindings for SQLite3
-V =3.24.0
+V =3.30.1
VER = ${V:S/.//g}
-DISTNAME = sqlite-autoconf-${VER:C/.$/0\0/}00
+DISTNAME = sqlite-src-${VER:C/.$/0\0/}00
PKGNAME = sqlite3-tcl-${V}
+EXTRACT_SUFX = .zip
CATEGORIES = databases
HOMEPAGE = http://www.sqlite.org/
MAINTAINER = Stuart Cassoff
@@ -16,11 +17,12 @@
WANTLIB = pthread
-MASTER_SITES = ${HOMEPAGE}2018/
+MASTER_SITES = ${HOMEPAGE}2019/
MODULES = lang/tcl
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS}
RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
+MODTCL_VERSION = 8.6
FAKE_FLAGS = PKG_DIR=sqlite3
SEPARATE_BUILD = Yes
@@ -28,8 +30,7 @@
CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \
--libdir=${MODTCL_TCLDIR}
-
-NO_TEST = Yes
+CONFIGURE_ENV =CPPFLAGS=-I${LOCALBASE}/include
CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA=1 \
-DSQLITE_ENABLE_DBSTAT_VTAB=1 \
@@ -45,7 +46,20 @@
-DSQLITE_LIKE_DOESNT_MATCH_BLOBS=1 \
-DSQLITE_SOUNDEX=1
-WRKSRC = ${WRKDIST}/tea
SUBST_VARS = VER
+
+WRKSRC = ${WRKDIST}/autoconf/tea
+
+do-gen:
+ # taken from tool/mkautoconfamal.sh
+ sed -ie "s/AC_INIT(\[sqlite\], .*)/AC_INIT([sqlite], [$V])/"
${WRKSRC}/configure.ac
+ cd ${WRKSRC} && autoconf-2.69
+ mkdir ${WRKSRC}/generic && \
+ echo '#include ' > ${WRKSRC}/generic/tclsqlite3.c &&
\
+ sed -e 's/"sqlite3.h"//'
${WRKSRC}/../../src/tclsqlite.c >> ${WRKSRC}/generic/tclsqlite3.c
+
+do-test:
+ cd ${WRKDIST} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT}
${CONFIGURE_ARGS} && ${MAKE} fulltest
+
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/sqlite3-tcl/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo25 Jun 2018 17:47:01 - 1.7
+++ distinfo9 Nov 2019 14:50:22 -
@@ -1,2 +1,2 @@
-SHA256 (sqlite-autoconf-324.tar.gz) =
2dFOiMb7bWjenKDR+Xl0d9gvw67WE1WPh/+9u8XOt0o=
-SIZE (sqlite-autoconf-324.tar.gz) = 2699252
+SHA256 (sqlite-src-3300100.zip) = RpA3BzcYkUnJ6DREFKo3H4mnDjdEujF87xpJ+w7oHOE=
+SIZE (sqlite-src-3300100.zip) = 12648162
Index: patches/patch-autoconf_tea_tclconfig_tcl_m4
===
RCS file: patches/patch-autoconf_tea_tclconfig_tcl_m4
diff -N patches/patch-autoconf_tea_tclconfig_tcl_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-autoconf_tea_tclconfig_tcl_m4 9 Nov 2019 14:50:22 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: autoconf/tea/tclconfig/tcl.m4
+--- autoconf/tea/tclconfig/tcl.m4.orig
autoconf/tea/tclconfig/tcl.m4
+@@ -1598,7 +1598,7 @@ AC_DEFUN([TEA_CONFIG_CFLAGS], [
+ AS_IF([test $doRpath = yes], [
+ CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
+ LDFLAGS="-Wl,-export-dynamic"
+ ;;
+ esac
Index: patches/patch-src_shell_c_in
===
RCS file: patches/patch-src_shell_c_in
diff -N patches/patch-src_shell_c_in
--- /dev/null 1 Jan 1970
