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 what I'd like it to do. Maybe someone else can come up with a faster or simpler implementation. I changed the compute_direct_ancestors code so I could call it twice in a single run. Closed-Leaf check-in: c7c4279f13 user: viriketo tags: annotatecmd_fix | |
Changes to src/main.mk.
| ︙ | ︙ | |||
285 286 287 288 289 290 291 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c # WARNING. DANGER. Running the testsuite modifies the repository the # build is done from, i.e. the checkout belongs to. Do not sync/push # the repository after running the tests. | | | | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c # WARNING. DANGER. Running the testsuite modifies the repository the # build is done from, i.e. the checkout belongs to. Do not sync/push # the repository after running the tests. test: $(OBJDIR) $(APPNAME) $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set # to 1. If it is set to 1, then there is no need to build or link # the sqlite3.o object. Instead, the system sqlite will be linked |
| ︙ | ︙ |
Changes to src/makemake.tcl.
| ︙ | ︙ | |||
180 181 182 183 184 185 186 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c # WARNING. DANGER. Running the testsuite modifies the repository the # build is done from, i.e. the checkout belongs to. Do not sync/push # the repository after running the tests. | | | | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 | $(OBJDIR)/mkversion: $(SRCDIR)/mkversion.c $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c # WARNING. DANGER. Running the testsuite modifies the repository the # build is done from, i.e. the checkout belongs to. Do not sync/push # the repository after running the tests. test: $(OBJDIR) $(APPNAME) $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \ $(SRCDIR)/../manifest \ $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set |
| ︙ | ︙ |
Changes to test/merge5.test.
| ︙ | ︙ | |||
36 37 38 39 40 41 42 |
} else {
test merge5-$testid 1
}
}
catch {exec $::fossilexe info} res
puts res=$res
| | > > > > | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 |
} else {
test merge5-$testid 1
}
}
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
#
# Fossil will write data on $HOME, running 'fossil open' here.
# We need not to clutter the $HOME of the test caller.
set env(HOME) [pwd]
# Construct a test repository
#
exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
fossil rebuild m5.fossil
fossil open m5.fossil
fossil update baseline
|
| ︙ | ︙ |
Changes to test/merge_renames.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 |
#
# Tests for merging with renames
#
#
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
######################################
# Test 1 #
# Reported: Ticket [554f44ee74e3d] #
######################################
fossil new rep.fossil
| > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 |
#
# Tests for merging with renames
#
#
catch {exec $::fossilexe info} res
puts res=$res
if {![regexp {use --repository} $res]} {
puts stderr "Cannot run this test within an open checkout"
return
}
# Fossil will write data on $HOME, running 'fossil new' here.
# We need not to clutter the $HOME of the test caller.
set env(HOME) [pwd]
######################################
# Test 1 #
# Reported: Ticket [554f44ee74e3d] #
######################################
fossil new rep.fossil
|
| ︙ | ︙ |