ci: Adapt CI tests for Blackcoin (WIP)

lateminer · Feb 8, 2024 · a364f6d · a364f6d
1 parent 04dc37f
commit a364f6d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ci/test/06_script_b.sh b/ci/test/06_script_b.sh
@@ -136,7 +136,7 @@ bash -c "${BASE_ROOT_DIR}/configure --cache-file=config.cache $BITCOIN_CONFIG_AL
 
 make distdir VERSION="$HOST"
 
-cd "${BASE_BUILD_DIR}/bitcoin-$HOST"
+cd "${BASE_BUILD_DIR}/blackcoin-$HOST"
 
 bash -c "./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG" || ( (cat config.log) && false)
 
@@ -180,18 +180,18 @@ if [ "${RUN_TIDY}" = "true" ]; then
   cmake --build /tidy-build --target bitcoin-tidy-tests "$MAKEJOBS"
 
   set -eo pipefail
-  cd "${BASE_BUILD_DIR}/bitcoin-$HOST/src/"
+  cd "${BASE_BUILD_DIR}/blackcoin-$HOST/src/"
   ( run-clang-tidy-"${TIDY_LLVM_V}" -quiet -load="/tidy-build/libbitcoin-tidy.so" "${MAKEJOBS}" ) | grep -C5 "error"
   # Filter out files by regex here, because regex may not be
   # accepted in src/.bear-tidy-config
   # Filter out:
   # * qt qrc and moc generated files
   jq 'map(select(.file | test("src/qt/qrc_.*\\.cpp$|/moc_.*\\.cpp$") | not))' ../compile_commands.json > tmp.json
   mv tmp.json ../compile_commands.json
-  cd "${BASE_BUILD_DIR}/bitcoin-$HOST/"
+  cd "${BASE_BUILD_DIR}/blackcoin-$HOST/"
   python3 "/include-what-you-use/iwyu_tool.py" \
            -p . "${MAKEJOBS}" \
-           -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/bitcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
+           -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="${BASE_BUILD_DIR}/blackcoin-$HOST/contrib/devtools/iwyu/bitcoin.core.imp" \
            -Xiwyu --max_line_length=160 \
            2>&1 | tee /tmp/iwyu_ci.out
   cd "${BASE_ROOT_DIR}/src"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -660,7 +660,7 @@ libbitcoin_consensus_a_SOURCES = \
   script/script_error.h \
   serialize.h \
   span.h \
-  timedatadummy.cpp \
+  timedata.h \
   tinyformat.h \
   uint256.cpp \
   uint256.h \

diff --git a/src/primitives/transaction.cpp b/src/primitives/transaction.cpp
@@ -9,14 +9,14 @@
 #include <hash.h>
 #include <script/script.h>
 #include <serialize.h>
+#include <timedata.h>
 #include <tinyformat.h>
 #include <uint256.h>
 #include <util/strencodings.h>
 #include <version.h>
 
 #include <cassert>
 #include <stdexcept>
-#include <timedata.h>
 
 std::string COutPoint::ToString() const
 {