Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch maketest_fixes Excluding Merge-Ins
This is equivalent to a diff from e161670939 to 6f285b5fa9
|
2011-10-20
| ||
| 01:14 | Merge the maketest_fixes branch into trunk. check-in: 9ee570846b user: drh tags: trunk | |
| 01:12 | Additional makefile changes so the "../$CHECKOUT/configure; make test" works. Closed-Leaf check-in: 6f285b5fa9 user: drh tags: maketest_fixes | |
| 01:04 | Fix the makefile so that "make test" works from a sibling build directory. check-in: 16d7e4a5c0 user: drh tags: maketest_fixes | |
| 00:57 | Update the built-in SQLite to the latest 3.7.9 beta. check-in: ccf43e1882 user: drh tags: trunk | |
|
2011-10-19
| ||
| 22:31 | merged in trunk [e161670939b93ec]. check-in: 1d0a7103a3 user: stephan tags: json-multitag-test, json | |
| 20:28 | Bringing back the fixes for the 'make test' from [bf480a29a6], [e46be99ff4], [129605856a], for an eventual merge to trunk. check-in: 5692702d50 user: viriketo tags: maketest_fixes | |
| 19:54 | Merge in the annotatecmd_fix branch. check-in: e161670939 user: drh tags: trunk | |
| 18:59 | Fix for ticket [e5999e25eedeb]. Code style fix. check-in: 4a296c0b1c user: jan tags: trunk | |
|
2011-10-18
| ||
| 19:45 | Should fix ticket [f0f9aff371f2]. Until now, the annotate_cmd was taking the last (or any?) checkin that had the artifact to be annotated, totally unrelated to what version is checked out. I made annotate_cmd respect the checkout, and annotate only from the past until the checked out version. This makes the command slower, but at least does... Closed-Leaf check-in: c7c4279f13 user: viriketo tags: annotatecmd_fix | |
Changes to src/main.mk.
285 285 286 286 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c 287 287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c 288 288 289 289 # WARNING. DANGER. Running the testsuite modifies the repository the 290 290 # build is done from, i.e. the checkout belongs to. Do not sync/push 291 291 # the repository after running the tests. 292 -test: $(APPNAME) 293 - $(TCLSH) test/tester.tcl $(APPNAME) 292 +test: $(OBJDIR) $(APPNAME) 293 + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) 294 294 295 295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion 296 296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h 297 297 298 298 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set 299 299 # to 1. If it is set to 1, then there is no need to build or link 300 300 # the sqlite3.o object. Instead, the system sqlite will be linked
Changes to src/makemake.tcl.
180 180 181 181 $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c 182 182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c 183 183 184 184 # WARNING. DANGER. Running the testsuite modifies the repository the 185 185 # build is done from, i.e. the checkout belongs to. Do not sync/push 186 186 # the repository after running the tests. 187 -test: $(APPNAME) 188 - $(TCLSH) test/tester.tcl $(APPNAME) 187 +test: $(OBJDIR) $(APPNAME) 188 + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) 189 189 190 190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion 191 191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ 192 192 $(SRCDIR)/../manifest \ 193 193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h 194 194 195 195 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
Changes to test/merge5.test.
36 36 } else { 37 37 test merge5-$testid 1 38 38 } 39 39 } 40 40 41 41 catch {exec $::fossilexe info} res 42 42 puts res=$res 43 -if {![regexp {not within an open checkout} $res]} { 43 +if {![regexp {use --repository} $res]} { 44 44 puts stderr "Cannot run this test within an open checkout" 45 45 return 46 46 } 47 +# 48 +# Fossil will write data on $HOME, running 'fossil open' here. 49 +# We need not to clutter the $HOME of the test caller. 50 +set env(HOME) [pwd] 47 51 48 52 # Construct a test repository 49 53 # 50 54 exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql 51 55 fossil rebuild m5.fossil 52 56 fossil open m5.fossil 53 57 fossil update baseline
Changes to test/merge_renames.test.
5 5 6 6 catch {exec $::fossilexe info} res 7 7 puts res=$res 8 8 if {![regexp {use --repository} $res]} { 9 9 puts stderr "Cannot run this test within an open checkout" 10 10 return 11 11 } 12 + 13 + 14 +# Fossil will write data on $HOME, running 'fossil new' here. 15 +# We need not to clutter the $HOME of the test caller. 16 +set env(HOME) [pwd] 17 + 12 18 13 19 ###################################### 14 20 # Test 1 # 15 21 # Reported: Ticket [554f44ee74e3d] # 16 22 ###################################### 17 23 18 24 fossil new rep.fossil