Fossil SCM

Merge the maketest_fixes branch into trunk.

drh 2011-10-20 01:14 trunk merge
Commit 9ee570846b05c4787d197c3282bc891c7d05e071
Parent ccf43e1882d8994…
4 files changed +2 -2 +2 -2 +5 -1 +6
~ src/main.mk ~ src/makemake.tcl ~ test/merge5.test ~ test/merge_renames.test
M src/main.mk
+2 -2
--- src/main.mk
+++ src/main.mk
@@ -287,12 +287,12 @@
287287
 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288288
289289
 # WARNING. DANGER. Running the testsuite modifies the repository the
290290
 # build is done from, i.e. the checkout belongs to. Do not sync/push
291291
 # 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)
294294
295295
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296296
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297297
298298
 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
299299
--- src/main.mk
+++ src/main.mk
@@ -287,12 +287,12 @@
287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
289 # WARNING. DANGER. Running the testsuite modifies the repository the
290 # build is done from, i.e. the checkout belongs to. Do not sync/push
291 # the repository after running the tests.
292 test: $(APPNAME)
293 $(TCLSH) test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
299
--- src/main.mk
+++ src/main.mk
@@ -287,12 +287,12 @@
287 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
288
289 # WARNING. DANGER. Running the testsuite modifies the repository the
290 # build is done from, i.e. the checkout belongs to. Do not sync/push
291 # the repository after running the tests.
292 test: $(OBJDIR) $(APPNAME)
293 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
299
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,12 +182,12 @@
182182
 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183183
184184
 # WARNING. DANGER. Running the testsuite modifies the repository the
185185
 # build is done from, i.e. the checkout belongs to. Do not sync/push
186186
 # 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)
189189
190190
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191191
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192192
 $(SRCDIR)/../manifest \
193193
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194194
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,12 +182,12 @@
182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
184 # WARNING. DANGER. Running the testsuite modifies the repository the
185 # build is done from, i.e. the checkout belongs to. Do not sync/push
186 # the repository after running the tests.
187 test: $(APPNAME)
188 $(TCLSH) test/tester.tcl $(APPNAME)
189
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -182,12 +182,12 @@
182 $(BCC) -o $(OBJDIR)/mkversion $(SRCDIR)/mkversion.c
183
184 # WARNING. DANGER. Running the testsuite modifies the repository the
185 # build is done from, i.e. the checkout belongs to. Do not sync/push
186 # the repository after running the tests.
187 test: $(OBJDIR) $(APPNAME)
188 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
189
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194
M test/merge5.test
+5 -1
--- test/merge5.test
+++ test/merge5.test
@@ -38,14 +38,18 @@
3838
 }
3939
 }
4040
4141
 catch {exec $::fossilexe info} res
4242
 puts res=$res
43
-if {![regexp {not within an open checkout} $res]} {
43
+if {![regexp {use --repository} $res]} {
4444
 puts stderr "Cannot run this test within an open checkout"
4545
 return
4646
 }
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]
4751
4852
 # Construct a test repository
4953
 #
5054
 exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
5155
 fossil rebuild m5.fossil
5256
--- test/merge5.test
+++ test/merge5.test
@@ -38,14 +38,18 @@
38 }
39 }
40
41 catch {exec $::fossilexe info} res
42 puts res=$res
43 if {![regexp {not within an open checkout} $res]} {
44 puts stderr "Cannot run this test within an open checkout"
45 return
46 }
 
 
 
 
47
48 # Construct a test repository
49 #
50 exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
51 fossil rebuild m5.fossil
52
--- test/merge5.test
+++ test/merge5.test
@@ -38,14 +38,18 @@
38 }
39 }
40
41 catch {exec $::fossilexe info} res
42 puts res=$res
43 if {![regexp {use --repository} $res]} {
44 puts stderr "Cannot run this test within an open checkout"
45 return
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]
51
52 # Construct a test repository
53 #
54 exec sqlite3 m5.fossil <$testdir/${testfile}_repo.sql
55 fossil rebuild m5.fossil
56
M test/merge_renames.test
+6
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -7,10 +7,16 @@
77
 puts res=$res
88
 if {![regexp {use --repository} $res]} {
99
 puts stderr "Cannot run this test within an open checkout"
1010
 return
1111
 }
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
+
1218
1319
 ######################################
1420
 # Test 1 #
1521
 # Reported: Ticket [554f44ee74e3d] #
1622
 ######################################
1723
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -7,10 +7,16 @@
7 puts res=$res
8 if {![regexp {use --repository} $res]} {
9 puts stderr "Cannot run this test within an open checkout"
10 return
11 }
 
 
 
 
 
 
12
13 ######################################
14 # Test 1 #
15 # Reported: Ticket [554f44ee74e3d] #
16 ######################################
17
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -7,10 +7,16 @@
7 puts res=$res
8 if {![regexp {use --repository} $res]} {
9 puts stderr "Cannot run this test within an open checkout"
10 return
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
18
19 ######################################
20 # Test 1 #
21 # Reported: Ticket [554f44ee74e3d] #
22 ######################################
23

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button