/sqlite3cc

To get this branch, use:
bzr branch http://bzr.ed.am/sqlite3cc

« back to all changes in this revision

Viewing changes to test/Makefile.in

  • Committer: edam
  • Date: 2010-07-29 20:56:19 UTC
  • Revision ID: edam@waxworlds.org-20100729205619-a9yo4uzu647nvnsj
- renamed database to connection to better identify what it is (would database_connection be better though?)
- moved basic_statement and basic_transaction to sqlite::detail
- made sqlite::threadsafe() return the threading mode int, not a bool
- renamed row::index() to row_number() so it isn't confused with column index
- added typedef for deferred_transaction
- added early rollback method to transaction_guard
- allowed transaction_guard::~transaction_guard() to throw exceptions, since when it needs to, we're really screwed anyway
- bugfix: query::reset() didn't reset the internal row counter
- added query::num_results()
- added docs/design-notes
- reimplemented query::iterator so that increment() (which performs a step() on the query) now caches the returned row to be returned during dereference() (previously it stashed details and returned new row!?)
- bugfix: resetting active queries during rollbacks would hang!

Show diffs side-by-side

added added

removed removed

test/Makefile.in
1
 
# Makefile.in generated by automake 1.11 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11.1 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
36
36
build_triplet = @build@
37
37
host_triplet = @host@
38
38
check_PROGRAMS = test-main$(EXEEXT)
 
39
TESTS = test-main$(EXEEXT)
39
40
subdir = test
40
41
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
41
42
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
51
52
CONFIG_CLEAN_VPATH_FILES =
52
53
am_test_main_OBJECTS = test-main.$(OBJEXT)
53
54
test_main_OBJECTS = $(am_test_main_OBJECTS)
54
 
test_main_DEPENDENCIES =
 
55
test_main_DEPENDENCIES = ../src/libsqlite3cc.la
55
56
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
56
57
depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
57
58
am__depfiles_maybe = depfiles
69
70
DIST_SOURCES = $(test_main_SOURCES)
70
71
ETAGS = etags
71
72
CTAGS = ctags
 
73
am__tty_colors = \
 
74
red=; grn=; lgn=; blu=; std=
72
75
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
73
76
ACLOCAL = @ACLOCAL@
74
77
AMTAR = @AMTAR@
81
84
CCDEPMODE = @CCDEPMODE@
82
85
CFLAGS = @CFLAGS@
83
86
CPP = @CPP@
84
 
CPPFLAGS = @CPPFLAGS@
 
87
CPPFLAGS = -I$(top_srcdir)/include
85
88
CXX = @CXX@
86
89
CXXCPP = @CXXCPP@
87
90
CXXDEPMODE = @CXXDEPMODE@
107
110
LDFLAGS = @LDFLAGS@
108
111
LIBOBJS = @LIBOBJS@
109
112
LIBS = @LIBS@
 
113
LIBSQLITE3CC_INTERFACE = @LIBSQLITE3CC_INTERFACE@
110
114
LIBTOOL = @LIBTOOL@
111
115
LIPO = @LIPO@
112
116
LN_S = @LN_S@
186
190
top_build_prefix = @top_build_prefix@
187
191
top_builddir = @top_builddir@
188
192
top_srcdir = @top_srcdir@
189
 
AM_CPPFLAGS = -I$(top_srcdir)/include
190
 
test_main_SOURCES = test-main.cc
191
 
test_main_LDADD = -L$(top_srcdir)/src -lsqlite3cc
 
193
test_main_SOURCES = \
 
194
        test-main.cc
 
195
 
 
196
test_main_LDADD = \
 
197
        ../src/libsqlite3cc.la \
 
198
        -lboost_filesystem-mt
 
199
 
192
200
all: all-am
193
201
 
194
202
.SUFFIXES:
323
331
distclean-tags:
324
332
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
325
333
 
 
334
check-TESTS: $(TESTS)
 
335
        @failed=0; all=0; xfail=0; xpass=0; skip=0; \
 
336
        srcdir=$(srcdir); export srcdir; \
 
337
        list=' $(TESTS) '; \
 
338
        $(am__tty_colors); \
 
339
        if test -n "$$list"; then \
 
340
          for tst in $$list; do \
 
341
            if test -f ./$$tst; then dir=./; \
 
342
            elif test -f $$tst; then dir=; \
 
343
            else dir="$(srcdir)/"; fi; \
 
344
            if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 
345
              all=`expr $$all + 1`; \
 
346
              case " $(XFAIL_TESTS) " in \
 
347
              *[\ \     ]$$tst[\ \      ]*) \
 
348
                xpass=`expr $$xpass + 1`; \
 
349
                failed=`expr $$failed + 1`; \
 
350
                col=$$red; res=XPASS; \
 
351
              ;; \
 
352
              *) \
 
353
                col=$$grn; res=PASS; \
 
354
              ;; \
 
355
              esac; \
 
356
            elif test $$? -ne 77; then \
 
357
              all=`expr $$all + 1`; \
 
358
              case " $(XFAIL_TESTS) " in \
 
359
              *[\ \     ]$$tst[\ \      ]*) \
 
360
                xfail=`expr $$xfail + 1`; \
 
361
                col=$$lgn; res=XFAIL; \
 
362
              ;; \
 
363
              *) \
 
364
                failed=`expr $$failed + 1`; \
 
365
                col=$$red; res=FAIL; \
 
366
              ;; \
 
367
              esac; \
 
368
            else \
 
369
              skip=`expr $$skip + 1`; \
 
370
              col=$$blu; res=SKIP; \
 
371
            fi; \
 
372
            echo "$${col}$$res$${std}: $$tst"; \
 
373
          done; \
 
374
          if test "$$all" -eq 1; then \
 
375
            tests="test"; \
 
376
            All=""; \
 
377
          else \
 
378
            tests="tests"; \
 
379
            All="All "; \
 
380
          fi; \
 
381
          if test "$$failed" -eq 0; then \
 
382
            if test "$$xfail" -eq 0; then \
 
383
              banner="$$All$$all $$tests passed"; \
 
384
            else \
 
385
              if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
 
386
              banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 
387
            fi; \
 
388
          else \
 
389
            if test "$$xpass" -eq 0; then \
 
390
              banner="$$failed of $$all $$tests failed"; \
 
391
            else \
 
392
              if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
 
393
              banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 
394
            fi; \
 
395
          fi; \
 
396
          dashes="$$banner"; \
 
397
          skipped=""; \
 
398
          if test "$$skip" -ne 0; then \
 
399
            if test "$$skip" -eq 1; then \
 
400
              skipped="($$skip test was not run)"; \
 
401
            else \
 
402
              skipped="($$skip tests were not run)"; \
 
403
            fi; \
 
404
            test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 
405
              dashes="$$skipped"; \
 
406
          fi; \
 
407
          report=""; \
 
408
          if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
 
409
            report="Please report to $(PACKAGE_BUGREPORT)"; \
 
410
            test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
 
411
              dashes="$$report"; \
 
412
          fi; \
 
413
          dashes=`echo "$$dashes" | sed s/./=/g`; \
 
414
          if test "$$failed" -eq 0; then \
 
415
            echo "$$grn$$dashes"; \
 
416
          else \
 
417
            echo "$$red$$dashes"; \
 
418
          fi; \
 
419
          echo "$$banner"; \
 
420
          test -z "$$skipped" || echo "$$skipped"; \
 
421
          test -z "$$report" || echo "$$report"; \
 
422
          echo "$$dashes$$std"; \
 
423
          test "$$failed" -eq 0; \
 
424
        else :; fi
 
425
 
326
426
distdir: $(DISTFILES)
327
427
        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
328
428
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
355
455
        done
356
456
check-am: all-am
357
457
        $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
 
458
        $(MAKE) $(AM_MAKEFLAGS) check-TESTS
358
459
check: check-am
359
460
all-am: Makefile
360
461
installdirs:
456
557
 
457
558
.MAKE: check-am install-am install-strip
458
559
 
459
 
.PHONY: CTAGS GTAGS all all-am check check-am clean \
 
560
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
460
561
        clean-checkPROGRAMS clean-generic clean-libtool ctags \
461
562
        distclean distclean-compile distclean-generic \
462
563
        distclean-libtool distclean-tags distdir dvi dvi-am html \