try to adapt to namespace cache structure

Author: graydon

.github/workflows/build.yml

@@ -55,11 +55,6 @@ jobs:
 
   build:
     runs-on: namespace-profile-jammy-32-stellar-core
-    env:
-      CACHED_PATHS: |
-        ~/.ccache
-        ~/.cargo
-        target
     strategy:
       fail-fast: false
       matrix:
@@ -82,7 +77,9 @@ jobs:
       - name: Configure Namespace cache volume
         uses: namespacelabs/nscloud-cache-action@v1
         with:
-          path: ${{ env.CACHED_PATHS }}
+          path: |
+            ~/.cargo
+            build-${{matrix.toolchain}}-${{matrix.protocol}}
 
       - name: install rustup
         run: ./install-rust.sh

ci-build.sh

@@ -68,6 +68,9 @@ NPROCS=$(getconf _NPROCESSORS_ONLN)
 echo "Found $NPROCS processors"
 date
 
+mkdir -p "build-${CC}-${PROTOCOL}"
+cd "build-${CC}-${PROTOCOL}"
+
 # Try to ensure we're using the real g++ and clang++ versions we want
 mkdir bin
 
@@ -111,7 +114,7 @@ export ASAN_OPTIONS="quarantine_size_mb=100:malloc_context_size=4:detect_leaks=0
 echo "config_flags = $config_flags"
 
 #### ccache config
-export CCACHE_DIR=$HOME/.ccache
+export CCACHE_DIR=$(pwd)/.ccache
 export CCACHE_COMPRESS=true
 export CCACHE_COMPRESSLEVEL=9
 # cache size should be large enough for a full build
@@ -130,8 +133,8 @@ ccache -p
 
 ccache -s
 date
-time ./autogen.sh
-time ./configure $config_flags
+time (cd .. && ./autogen.sh)
+time ../configure $config_flags
 if [ -z "${SKIP_FORMAT_CHECK}" ]; then
     make format
     d=`git diff | wc -l`

src/Makefile.am

@@ -65,11 +65,11 @@ endif # !BUILD_TESTS
 if ENABLE_NEXT_PROTOCOL_VERSION_UNSAFE_FOR_PRODUCTION
 CARGO_FEATURE_NEXT = --features next
 main/XDRFilesSha256.cpp: $(SRC_X_FILES) Makefile $(top_srcdir)/hash-xdrs.sh
-	$(top_srcdir)/hash-xdrs.sh protocol-next >$@
+	$(top_srcdir)/hash-xdrs.sh $(top_srcdir)/src/protocol-next >$@
 else
 CARGO_FEATURE_NEXT =
 main/XDRFilesSha256.cpp: $(SRC_X_FILES) Makefile $(top_srcdir)/hash-xdrs.sh
-	$(top_srcdir)/hash-xdrs.sh protocol-curr >$@
+	$(top_srcdir)/hash-xdrs.sh $(top_srcdir)/src/protocol-curr >$@
 endif
 
 stellar_core_LDADD = $(soci_LIBS) $(libmedida_LIBS)		\
@@ -89,6 +89,7 @@ BUILT_SOURCES = $(SRC_X_FILES:.x=.h) main/StellarCoreVersion.cpp main/XDRFilesSh
 $(SRC_X_FILES:.x=.h): $(XDRC)
 SUFFIXES = .x .h .rs
 .x.h:
+	mkdir -p $(@D)
 	$(XDRC) -hh -pedantic -o $@ $<
 
 BISON=bison
@@ -124,9 +125,10 @@ RUST_TOOLCHAIN_CHANNEL=$(shell sed -n 's/channel *= *"\([^"]*\)"/\1/p' $(RUST_TO
 endif
 CARGO=cargo +$(RUST_TOOLCHAIN_CHANNEL)
 
-# we pass RUST_TOOLCHAIN_CHANNEL by environment variable
+# we pass some configuration by environment variable
 # to tests since they can't take command-line arguments.
 export RUST_TOOLCHAIN_CHANNEL
+export top_srcdir
 
 RUST_BUILD_DIR=$(top_builddir)/src/rust
 RUST_BIN_DIR=$(RUST_BUILD_DIR)/bin
@@ -233,11 +235,12 @@ rust/RustBridge.cpp: rust/src/bridge.rs $(SRC_RUST_FILES) Makefile $(RUST_CXXBRI
 
 $(RUST_DEP_TREE_STAMP): $(wildcard rust/soroban/*/Cargo.*) Makefile $(RUST_TOOLCHAIN_FILE)
 	rm -f $@
+	mkdir -p $(RUST_BUILD_DIR)/src/dep-trees
 	for proto in $(ALL_SOROBAN_PROTOCOLS); \
 	do \
-		$(CARGO) tree --manifest-path rust/soroban/$${proto}/Cargo.toml --locked --package soroban-env-host --edges no-dev --target all \
+		$(CARGO) tree --manifest-path $(top_srcdir)/src/rust/soroban/$${proto}/Cargo.toml --locked --package soroban-env-host --edges no-dev --target all \
 		| sed -e "s@$(abspath $(top_srcdir))/@@g" > $(RUST_BUILD_DIR)/src/dep-trees/$${proto}-actual.txt ; \
-		if ! diff -u rust/src/dep-trees/$${proto}-expect.txt $(RUST_BUILD_DIR)/src/dep-trees/$${proto}-actual.txt; \
+		if ! diff -u $(top_srcdir)/src/rust/src/dep-trees/$${proto}-expect.txt $(RUST_BUILD_DIR)/src/dep-trees/$${proto}-actual.txt; \
 		then \
 			echo "dep trees differ, please update $${proto}-expect.txt or roll back submodule"; \
 			exit 1; \
@@ -346,9 +349,11 @@ $(SOROBAN_LIBS_STAMP): $(wildcard rust/soroban/p*/Cargo.lock) Makefile $(RUST_DE
 				FEATURE_FLAGS="$(CARGO_FEATURE_TRACY)" \
 			;; \
 		esac ; \
-		cd $(abspath $(RUST_BUILD_DIR))/soroban/$$proto && \
+		mkdir -p $(SOROBAN_BUILD_DIR)/$$proto/target && \
+		cd $(abspath $(top_srcdir))/src/rust/soroban/$$proto && \
 		CC="$(CC)" CXX="$(CXX)" LD="$(LD)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXXSTDLIB="$(CXXSTDLIB)" LDFLAGS="$(LDFLAGS)" \
 		RUSTFLAGS="-Cmetadata=$$proto" \
+		CARGO_TARGET_DIR=$(SOROBAN_BUILD_DIR)/$$proto/target \
 		CARGO_NET_GIT_FETCH_WITH_CLI=true \
 		$(CARGO) build \
 			--package soroban-env-host \

src/herder/test/TxSetTests.cpp

@@ -2262,9 +2262,14 @@ TEST_CASE("txset nomination", "[txset]")
         }
         namespace fs = std::filesystem;
         fs::path resultsPath = "testdata/txset/" + testName;
-        fs::create_directories(resultsPath.parent_path());
+        char* srcdir = getenv("top_srcdir");
+        if (srcdir)
+        {
+            resultsPath = fs::path(srcdir) / "src" / resultsPath;
+        }
         if (getenv("GENERATE_TEST_TXSETS"))
         {
+            fs::create_directories(resultsPath.parent_path());
             std::ofstream resultsStream(resultsPath);
             for (auto const& result : testResults)
             {

src/main/test/ApplicationUtilsTests.cpp

@@ -173,18 +173,24 @@ TEST_CASE("application major version numbers", "[applicationutils]")
 TEST_CASE("standalone quorum intersection check", "[applicationutils]")
 {
     Config cfg = getTestConfig();
-    const std::string JSON_ROOT = "testdata/check-quorum-intersection-json/";
+    namespace fs = std::filesystem;
+    fs::path JSON_ROOT = "testdata/check-quorum-intersection-json";
+    char* srcdir = getenv("top_srcdir");
+    if (srcdir)
+    {
+        JSON_ROOT = fs::path(srcdir) / "src" / JSON_ROOT;
+    }
 
     SECTION("enjoys quorum intersection")
     {
         REQUIRE(checkQuorumIntersectionFromJson(
-            JSON_ROOT + "enjoys-intersection.json", cfg));
+            JSON_ROOT / "enjoys-intersection.json", cfg));
     }
 
     SECTION("does not enjoy quorum intersection")
     {
         REQUIRE(!checkQuorumIntersectionFromJson(
-            JSON_ROOT + "no-intersection.json", cfg));
+            JSON_ROOT / "no-intersection.json", cfg));
     }
 
     SECTION("malformed JSON")
@@ -193,17 +199,17 @@ TEST_CASE("standalone quorum intersection check", "[applicationutils]")
 
         // Malformed key
         REQUIRE_THROWS_AS(
-            checkQuorumIntersectionFromJson(JSON_ROOT + "bad-key.json", cfg),
+            checkQuorumIntersectionFromJson(JSON_ROOT / "bad-key.json", cfg),
             KeyUtils::InvalidStrKey);
 
         // Wrong datatype
         REQUIRE_THROWS_AS(checkQuorumIntersectionFromJson(
-                              JSON_ROOT + "bad-threshold-type.json", cfg),
+                              JSON_ROOT / "bad-threshold-type.json", cfg),
                           std::runtime_error);
 
         // No such file
         REQUIRE_THROWS_AS(
-            checkQuorumIntersectionFromJson(JSON_ROOT + "no-file.json", cfg),
+            checkQuorumIntersectionFromJson(JSON_ROOT / "no-file.json", cfg),
             std::runtime_error);
     }
-}
+}

src/test/check-sorobans

@@ -28,9 +28,10 @@ SKIP_TESTS="host::declared_size::test::test_expected_size"
 set -e
 set -x
 
-cd rust/soroban
+cd "${top_srcdir}/src/rust/soroban"
 for i in p??; do
     cd $i
+    CARGO_TARGET_DIR="${top_builddir}/src/rust/soroban/${i}/target" \
     RUSTFLAGS="-Cmetadata=${i}" cargo +${RUST_TOOLCHAIN_CHANNEL} \
         test \
         --locked \

src/test/selftest-nopg

@@ -4,4 +4,4 @@
 # under the Apache License, Version 2.0. See the COPYING file at the root
 # of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-exec ./test/selftest-parallel ./test/run-selftest-nopg
+exec "${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-nopg"

src/test/selftest-pg

@@ -4,4 +4,4 @@
 # under the Apache License, Version 2.0. See the COPYING file at the root
 # of this distribution or at http://www.apache.org/licenses/LICENSE-2.0
 
-exec ./test/selftest-parallel ./test/run-selftest-pg
+exec "${top_srcdir}/src/test/selftest-parallel" "${top_srcdir}/src/test/run-selftest-pg"