mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-09 00:07:57 +03:00
b83b55c6ed
Tag number wasn't changed before generating manifest. Correct file/release now fetched and correct checksum generated. No longer a straight to stable ebuild, either. New depend on dev-tcltk/tcllib for JSON tests. If the package is missing, as it currently will be on riscv architectures, the tests are nonfatally skipped. Several more test patches included from upstream to fix tests that didn't work in the wider world. Now installs a man page. Thanks to Bernd Feige <Bernd.Feige@gmx.net> for this addition. Closes: https://bugs.gentoo.org/931862 Closes: https://bugs.gentoo.org/923783 Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>
188 lines
5.2 KiB
Diff
188 lines
5.2 KiB
Diff
Index: test/amend.test
|
|
==================================================================
|
|
--- test/amend.test
|
|
+++ test/amend.test
|
|
@@ -313,10 +313,11 @@
|
|
}
|
|
foreach res [lsort -nocase $result] {
|
|
append t2exp "sym-$res*"
|
|
}
|
|
eval fossil amend $HASH $tags
|
|
+ set t1exp [string trimleft $t1exp ,]
|
|
test amend-tag-$tc.1 {[string match "*hash:*$HASH*tags:*$t1exp*" $RESULT]}
|
|
fossil tag ls --raw $HASH
|
|
test amend-tag-$tc.2 {[string match $t2exp $RESULT]}
|
|
fossil timeline -n 1
|
|
test amend-tag-$tc.3 {[string match $t3exp $RESULT]}
|
|
|
|
Index: test/merge5.test
|
|
==================================================================
|
|
--- test/merge5.test
|
|
+++ test/merge5.test
|
|
@@ -23,11 +23,11 @@
|
|
}
|
|
protOut {
|
|
fossil sqlite3 --no-repository reacts badly to SQL dumped from
|
|
repositories created from fossil older than version 2.0.
|
|
}
|
|
-test merge5-sqlite3-issue false knownBug
|
|
+#test merge5-sqlite3-issue false knownBug
|
|
test_cleanup_then_return
|
|
|
|
# Verify the results of a check-out
|
|
#
|
|
proc checkout-test {testid expected_content} {
|
|
|
|
Index: test/stash.test
|
|
==================================================================
|
|
--- test/stash.test
|
|
+++ test/stash.test
|
|
@@ -168,14 +168,14 @@
|
|
|
|
########
|
|
# fossil stash show|cat ?STASHID? ?DIFF-OPTIONS?
|
|
# fossil stash [g]diff ?STASHID? ?DIFF-OPTIONS?
|
|
|
|
-fossil stash show
|
|
-test stash-1-show {[normalize_result] eq $diff_stash_1}
|
|
-fossil stash diff
|
|
-test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
|
|
+#fossil stash show
|
|
+#test stash-1-show {[normalize_result] eq $diff_stash_1}
|
|
+#fossil stash diff
|
|
+#test stash-1-diff {[normalize_result] eq $diff_stash_1} knownBug
|
|
|
|
########
|
|
# fossil stash pop
|
|
|
|
stash-test 2 pop {
|
|
@@ -206,16 +206,16 @@
|
|
# fossil: ./src/delta.c:231: checksum: Assertion '...' failed.
|
|
# Should be triggered by this stash-WY-1 test.
|
|
fossil checkout --force c1
|
|
fossil clean
|
|
fossil mv --soft f1 f1new
|
|
-stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
|
|
- REVERT f1
|
|
- DELETE f1new
|
|
-} -changes {
|
|
-} -addremove {
|
|
-} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
|
|
+#stash-test WY-1 {-expectError save -m "Reported 2016-02-09"} {
|
|
+# REVERT f1
|
|
+# DELETE f1new
|
|
+#} -changes {
|
|
+#} -addremove {
|
|
+#} -exists {f1 f2 f3} -notexists {f1new} -knownbugs {-code -result}
|
|
# TODO: add tests that verify the saved stash is sensible. Possibly
|
|
# by applying it and checking results. But until the SQLITE_CONSTRAINT
|
|
# error is fixed, there is nothing stashed to test.
|
|
|
|
|
|
@@ -296,16 +296,17 @@
|
|
}] -changes {
|
|
RENAMED f2 -> f2n
|
|
} -addremove {
|
|
} -exists {f1 f2n} -notexists {f2}
|
|
|
|
-stash-test 3-2 {save -m f2n} {
|
|
- REVERT f2
|
|
- DELETE f2n
|
|
-} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
|
|
+fossil stash save -m f2n
|
|
+#stash-test 3-2 {save -m f2n} {
|
|
+# REVERT f2
|
|
+# DELETE f2n
|
|
+#} -exists {f1 f2} -notexists {f2n} -knownbugs {-result}
|
|
fossil stash show
|
|
-test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
|
|
+#test stash-3-2-show-1 {![regexp {\sf1} $RESULT]} knownBug
|
|
test stash-3-2-show-2 {[regexp {\sf2n} $RESULT]}
|
|
stash-test 3-2-pop {pop} {
|
|
UPDATE f1
|
|
UPDATE f2n
|
|
} -changes {
|
|
|
|
Index: test/tester.tcl
|
|
==================================================================
|
|
--- test/tester.tcl
|
|
+++ test/tester.tcl
|
|
@@ -308,10 +308,11 @@
|
|
comment-format \
|
|
crlf-glob \
|
|
crnl-glob \
|
|
default-csp \
|
|
default-perms \
|
|
+ default-skin \
|
|
diff-binary \
|
|
diff-command \
|
|
dont-commit \
|
|
dont-push \
|
|
dotfiles \
|
|
|
|
Index: test/utf.test
|
|
==================================================================
|
|
--- test/utf.test
|
|
+++ test/utf.test
|
|
@@ -35,11 +35,11 @@
|
|
set i 1
|
|
foreach {fileName result} $args {
|
|
set fileName [file join $tempPath $fileName]
|
|
fossil test-looks-like-utf $fileName
|
|
set result [string map [list %TEMP% $tempPath \r\n \n] $result]
|
|
- # if {$::RESULT ne $result} {puts stdout $::RESULT}
|
|
+ # if {$::RESULT ne $result} {puts stdout $::RESULT; exit}
|
|
test utf-check-$testname.$i {$::RESULT eq $result}
|
|
incr i
|
|
}
|
|
}
|
|
|
|
@@ -17613,12 +17613,12 @@
|
|
|
|
utf-check 1179 utf-check-1179-2-129-1.jnk \
|
|
{File "%TEMP%/utf-check-1179-2-129-1.jnk" has 7 bytes.
|
|
Starts with UTF-8 BOM: no
|
|
Starts with UTF-16 BOM: yes
|
|
-Looks like UTF-8: no
|
|
-Has flag LOOK_NUL: yes
|
|
+Looks like UTF-8: yes
|
|
+Has flag LOOK_NUL: no
|
|
Has flag LOOK_CR: no
|
|
Has flag LOOK_LONE_CR: no
|
|
Has flag LOOK_LF: no
|
|
Has flag LOOK_LONE_LF: no
|
|
Has flag LOOK_CRLF: no
|
|
@@ -24124,27 +24124,27 @@
|
|
Has flag LOOK_SHORT: no}
|
|
|
|
utf-check 1586 utf-check-1586-3-128-0.jnk \
|
|
{File "%TEMP%/utf-check-1586-3-128-0.jnk" has 6 bytes.
|
|
Starts with UTF-8 BOM: no
|
|
-Starts with UTF-16 BOM: no
|
|
-Looks like UTF-8: no
|
|
+Starts with UTF-16 BOM: reversed
|
|
+Looks like UTF-16: no
|
|
Has flag LOOK_NUL: yes
|
|
Has flag LOOK_CR: no
|
|
Has flag LOOK_LONE_CR: no
|
|
Has flag LOOK_LF: no
|
|
Has flag LOOK_LONE_LF: no
|
|
Has flag LOOK_CRLF: no
|
|
Has flag LOOK_LONG: no
|
|
-Has flag LOOK_INVALID: yes
|
|
+Has flag LOOK_INVALID: no
|
|
Has flag LOOK_ODD: no
|
|
Has flag LOOK_SHORT: no}
|
|
|
|
utf-check 1587 utf-check-1587-3-128-1.jnk \
|
|
{File "%TEMP%/utf-check-1587-3-128-1.jnk" has 7 bytes.
|
|
Starts with UTF-8 BOM: no
|
|
-Starts with UTF-16 BOM: no
|
|
+Starts with UTF-16 BOM: reversed
|
|
Looks like UTF-8: no
|
|
Has flag LOOK_NUL: yes
|
|
Has flag LOOK_CR: no
|
|
Has flag LOOK_LONE_CR: no
|
|
Has flag LOOK_LF: no
|
|
|