Fossil

Check-in [b460373e]
Login

Check-in [b460373e]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Adjust the 'merge5' test as well.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | testerCleanup
Files: files | file ages | folders
SHA1: b460373e015a2b0c6d6bbfdfac83c6d7f62bccc8
User & Date: mistachkin 2016-03-02 08:25:20.529
Original User & Date: drh 2016-03-02 08:25:20.529
Context
2016-03-02
08:35
Make sure 'repo_init' is called before 'pwd'. ... (check-in: b9558349 user: mistachkin tags: testerCleanup)
08:25
Adjust the 'merge5' test as well. ... (check-in: b460373e user: mistachkin tags: testerCleanup)
08:13
All test files must now call 'repo_init', using an empty string if they do not require a new repository. ... (check-in: 3a578e04 user: mistachkin tags: testerCleanup)
Changes
Unified Diff Ignore Whitespace Patch
Changes to test/merge5.test.
︙︙
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

    protOut "  Got:\n    $result"
    test merge5-$testid 0
  } else {
    test merge5-$testid 1
  }    
}

require_no_open_checkout; set_home_to_elsewhere

# Construct a test repository
#
exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql
fossil rebuild m5.fossil
fossil open m5.fossil
fossil user default drh --user drh








|








34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

    protOut "  Got:\n    $result"
    test merge5-$testid 0
  } else {
    test merge5-$testid 1
  }    
}

require_no_open_checkout; repo_init ""

# Construct a test repository
#
exec $::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql
fossil rebuild m5.fossil
fossil open m5.fossil
fossil user default drh --user drh
︙︙