[Pkg-bitcoin-commits] [litecoin] 01/01: fix failing test; replace disabling patch with new patch from upstream.
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Sat Jul 4 12:53:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch master
in repository litecoin.
commit 4c1a7f6 (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat Jul 4 12:51:33 2015
fix failing test; replace disabling patch with new patch from upstream.
---
debian/changelog | 2 +-
debian/patches/disable-bitcoin-util-test.patch | 23 ------
debian/patches/series | 3 +-
debian/patches/upstream-util-test.patch | 99 ++++++++++++++++++++++++++
4 files changed, 101 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63228c1..16aa47c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,7 +16,7 @@ litecoin (0.10.2.2-1) UNRELEASED; urgency=medium
* Minor update to long package description.
* Patchworks:
- Removed "builddate.patch".
- + Added "disable-bitcoin-util-test.patch".
+ + Added "upstream-util-test.patch".
+ Re-done and re-named remaining patches.
* Removed obsolete lintian-overrides.
* Convert icon reproducibly (Closes: #778984).
diff --git a/debian/patches/disable-bitcoin-util-test.patch b/debian/patches/disable-bitcoin-util-test.patch
deleted file mode 100644
index d7a4bdc..0000000
--- a/debian/patches/disable-bitcoin-util-test.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Last-Update: 2015-07-04
-Forwarded: not-needed
-Bug-Upstream: https://github.com/litecoin-project/litecoin/issues/207
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: disable failing test.
-
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -1,12 +1,12 @@
--TESTS += test/test_litecoin test/bitcoin-util-test.py
-+TESTS += test/test_litecoin
-+# test/bitcoin-util-test.py
- bin_PROGRAMS += test/test_litecoin
- TEST_SRCDIR = test
- TEST_BINARY=test/test_litecoin$(EXEEXT)
-
- EXTRA_DIST += \
- test/bctest.py \
-- test/bitcoin-util-test.py \
- test/data/bitcoin-util-test.json \
- test/data/blanktx.hex \
- test/data/tt-delin1-out.hex \
- test/data/tt-delout1-out.hex \
diff --git a/debian/patches/series b/debian/patches/series
index 556e537..8e9bbb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
-disable-bitcoin-util-test.patch
-
## disabled due to local modifications:
#system-json-spirit.patch
system-leveldb.patch
+upstream-util-test.patch
diff --git a/debian/patches/upstream-util-test.patch b/debian/patches/upstream-util-test.patch
new file mode 100644
index 0000000..df71d62
--- /dev/null
+++ b/debian/patches/upstream-util-test.patch
@@ -0,0 +1,99 @@
+Last-Update: 2015-07-04
+Forwarded: not-needed
+Bug-Upstream: https://github.com/litecoin-project/litecoin/issues/207
+Origin: upstream, https://github.com/litecoin-project/litecoin/commit/e5bd36ab
+From: Adrian Gallagher <thrasher at addictionsoftware.com>
+Description: fix failing test.
+
+--- a/src/test/data/bitcoin-util-test.json
++++ b/src/test/data/bitcoin-util-test.json
+@@ -1,60 +1,60 @@
+ [
+- { "exec": "././bitcoin-tx",
++ { "exec": "././litecoin-tx",
+ "args": ["-create"],
+ "output_cmp": "blanktx.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-"],
+ "input": "blanktx.hex",
+ "output_cmp": "blanktx.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-", "delin=1"],
+ "input": "tx394b54bb.hex",
+ "output_cmp": "tt-delin1-out.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-", "delin=31"],
+ "input": "tx394b54bb.hex",
+ "return_code": 1
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-", "delout=1"],
+ "input": "tx394b54bb.hex",
+ "output_cmp": "tt-delout1-out.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-", "delout=2"],
+ "input": "tx394b54bb.hex",
+ "return_code": 1
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-", "locktime=317000"],
+ "input": "tx394b54bb.hex",
+ "output_cmp": "tt-locktime317000-out.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args":
+ ["-create",
+- "in=5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f:0",
+- "in=bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c:18",
+- "in=22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc:1",
+- "outaddr=0.18:13tuJJDR2RgArmgfv6JScSdreahzgc4T6o",
+- "outaddr=4:1P8yWvZW8jVihP1bzHeqfE4aoXNX8AVa46"],
++ "in=5ee62e3f7757f5fd995b2fa1bdb5b744298146098d5de92959ec4b52dc77191e:1",
++ "in=3cd215c1c6b7ae33bc6266f268fd212b83860e13902b454502ce6d54448e398a:25",
++ "in=0f941395005b80a61726baecebb11d7caa184a1a58246daff7dffca793ab07b8:12",
++ "outaddr=12.52000000:LMgENNXzzuPxp7vfMjDrCU44bsmrEMgqvc",
++ "outaddr=0.01000487:LV1ByjbJNFTHyFQqwqwdJXKJznYDzXzg4B"],
+ "output_cmp": "txcreate1.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args": ["-create", "outscript=0:"],
+ "output_cmp": "txcreate2.hex"
+ },
+- { "exec": "./bitcoin-tx",
++ { "exec": "./litecoin-tx",
+ "args":
+ ["-create",
+- "in=4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485:0",
+- "set=privatekeys:[\"5HpHagT65TZzG1PH3CSu63k8DbpvD8s5ip4nEB3kEsreAnchuDf\"]",
+- "set=prevtxs:[{\"txid\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\",\"vout\":0,\"scriptPubKey\":\"4d49a71ec9da436f71ec4ee231d04f292a29cd316f598bb7068feccabdc59485\"}]",
++ "in=6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7:0",
++ "set=privatekeys:[\"T3NKWWwSf4FUDdNERKpJ8umW2BRqPUezEpduHWJbFUtpXpMKC68M\"]",
++ "set=prevtxs:[{\"txid\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\",\"vout\":0,\"scriptPubKey\":\"6c2789243608b46f750f49ff24f6f79a78c3010f7e56951e045e5b7ea5d07bf7\"}]",
+ "sign=ALL",
+- "outaddr=0.001:193P6LtvS4nCnkDvM9uXn1gsSRqh4aDAz7"],
++ "outaddr=0.001:LQLz2YnNyhpFYbsVNFKZh1bNggmqz3EsAc"],
+ "output_cmp": "txcreatesign.hex"
+ }
+ ]
+--- a/src/test/data/txcreate1.hex
++++ b/src/test/data/txcreate1.hex
+@@ -1 +1 @@
+-01000000031f5c38dfcf6f1a5f5a87c416076d392c87e6d41970d5ad5e477a02d66bde97580000000000ffffffff7cca453133921c50d5025878f7f738d1df891fd359763331935784cf6b9c82bf1200000000fffffffffccd319e04a996c96cfc0bf4c07539aa90bd0b1a700ef72fae535d6504f9a6220100000000ffffffff0280a81201000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d717000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac00000000
++01000000031e1977dc524bec5929e95d8d0946812944b7b5bda12f5b99fdf557773f2ee65e0100000000ffffffff8a398e44546dce0245452b90130e86832b21fd68f26662bc33aeb7c6c115d23c1900000000ffffffffb807ab93a7fcdff7af6d24581a4a18aa7c1db1ebecba2617a6805b009513940f0c00000000ffffffff020001a04a000000001976a9141ae882e788091732da6910595314447c9e38bd8d88ac27440f00000000001976a9146b474cbf0f6004329b630bdd4798f2c23d1751b688ac00000000
+--- a/src/test/data/txcreatesign.hex
++++ b/src/test/data/txcreatesign.hex
+@@ -1 +1 @@
+-01000000018594c5bdcaec8f06b78b596f31cd292a294fd031e24eec716f43dac91ea7494d0000000000ffffffff01a0860100000000001976a9145834479edbbe0539b31ffd3a8f8ebadc2165ed0188ac00000000
++0100000001f77bd0a57e5b5e041e95567e0f01c3789af7f624ff490f756fb408362489276c0000000000ffffffff01a0860100000000001976a914382d03752bf6ae294a73b2bb0def022e3cc255ce88ac00000000
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/litecoin.git
More information about the Pkg-bitcoin-commits
mailing list