diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:23:59 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:36:15 +0200 |
| commit | f297042cae572753e6c25d25caf92091e88b76df (patch) | |
| tree | 59a0827f7d3500f1b145e4f5653f1f8b94c1e037 /src/test | |
| parent | 17d0e638b66b9dd51370335c9b0a7039de3f81fa (diff) | |
| parent | 95acf3cc6d90d9406030ce897efdee8be0550a53 (diff) | |
| download | bitcoin-f297042cae572753e6c25d25caf92091e88b76df.tar.xz | |
Merge pull request #6637
95acf3c remove $(@F) and subdirs from univalue make (Jonas Schnelli)
9623e93 [Univalue] add univalue over subtree (Jonas Schnelli)
2f9f082 Squashed 'src/univalue/' content from commit 87d9045 (Jonas Schnelli)
0917306 remove univalue, prepare for subtree (Jonas Schnelli)
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/base58_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/rpc_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/rpc_wallet_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/script_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/sighash_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/transaction_tests.cpp | 2 | ||||
| -rw-r--r-- | src/test/univalue_tests.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 9e74f5f427..9845df697f 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -18,7 +18,7 @@ #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> -#include "univalue/univalue.h" +#include <univalue.h> extern UniValue read_json(const std::string& jsondata); diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 1bd59497ff..2a486f08e4 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -13,7 +13,7 @@ #include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> -#include "univalue/univalue.h" +#include <univalue.h> using namespace std; diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp index 52f41be8ae..2e652f76e2 100644 --- a/src/test/rpc_wallet_tests.cpp +++ b/src/test/rpc_wallet_tests.cpp @@ -14,7 +14,7 @@ #include <boost/algorithm/string.hpp> #include <boost/test/unit_test.hpp> -#include "univalue/univalue.h" +#include <univalue.h> using namespace std; diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp index 225da0801a..882f9eb199 100644 --- a/src/test/script_tests.cpp +++ b/src/test/script_tests.cpp @@ -27,7 +27,7 @@ #include <boost/foreach.hpp> #include <boost/test/unit_test.hpp> -#include "univalue/univalue.h" +#include <univalue.h> using namespace std; diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 4b96461562..6fca64d5da 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -20,7 +20,7 @@ #include <boost/test/unit_test.hpp> -#include "univalue/univalue.h" +#include <univalue.h> extern UniValue read_json(const std::string& jsondata); diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index e70ebddc2f..beec396675 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -26,7 +26,7 @@ #include <boost/test/unit_test.hpp> #include <boost/assign/list_of.hpp> -#include "univalue/univalue.h" +#include <univalue.h> using namespace std; diff --git a/src/test/univalue_tests.cpp b/src/test/univalue_tests.cpp index ee31c0955b..945c1acbeb 100644 --- a/src/test/univalue_tests.cpp +++ b/src/test/univalue_tests.cpp @@ -6,7 +6,7 @@ #include <vector> #include <string> #include <map> -#include "univalue/univalue.h" +#include <univalue.h> #include "test/test_bitcoin.h" #include <boost/test/unit_test.hpp> |