fix: update tests for mcpp-index → mcpplibs rename

Update E2E and unit tests to expect "mcpplibs" as the default index
name. For tests that symlink pre-cached CI data, support both old
"mcpp-index" and new "mcpplibs" directory names.

Author: Sunrisepeak

tests/e2e/10_env_command.sh

@@ -19,16 +19,16 @@ out=$("$MCPP" self env 2>&1)
 [[ -f "$MCPP_HOME/registry/.xlings.json" ]]  || { echo "missing seeded .xlings.json"; exit 1; }
 [[ -x "$MCPP_HOME/registry/bin/xlings" ]] || { echo "xlings binary not acquired"; exit 1; }
 
-# Verify seeded .xlings.json contains mcpp-index and NOT awesome
-grep -q '"name": "mcpp-index"' "$MCPP_HOME/registry/.xlings.json" || {
-    echo "seeded .xlings.json missing mcpp-index"; exit 1; }
+# Verify seeded .xlings.json contains mcpplibs and NOT awesome
+grep -q '"name": "mcpplibs"' "$MCPP_HOME/registry/.xlings.json" || {
+    echo "seeded .xlings.json missing mcpplibs"; exit 1; }
 if grep -q '"name": "awesome"' "$MCPP_HOME/registry/.xlings.json"; then
     echo "seeded .xlings.json should NOT contain awesome"; exit 1
 fi
 
 # Output should mention key paths (use grep — [[ pattern match struggles with multi-line + parens)
 echo "$out" | grep -q 'MCPP_HOME'     || { echo "no MCPP_HOME in env output"; exit 1; }
 echo "$out" | grep -q 'xlings binary' || { echo "no xlings binary in env output"; exit 1; }
-echo "$out" | grep -q 'mcpp-index'    || { echo "no mcpp-index in env output"; exit 1; }
+echo "$out" | grep -q 'mcpplibs'    || { echo "no mcpplibs in env output"; exit 1; }
 
 echo "OK"

tests/e2e/11_index_list.sh

@@ -10,8 +10,8 @@ export MCPP_HOME="$TMP/mcpp-home"
 # init
 "$MCPP" self env > /dev/null
 
-# list should at minimum show mcpp-index (from seeded config)
+# list should at minimum show mcpplibs (from seeded config)
 out=$("$MCPP" index list 2>&1)
-[[ "$out" == *"mcpp-index"* ]] || { echo "index list missing mcpp-index: $out"; exit 1; }
+[[ "$out" == *"mcpplibs"* ]] || { echo "index list missing mcpplibs: $out"; exit 1; }
 
 echo "OK"

tests/e2e/19_bmi_cache_reuse.sh

@@ -91,7 +91,7 @@ fp_dir="$(ls "$MCPP_HOME/bmi" | head -1)"
 [[ -n "$fp_dir" ]] || { echo "no fingerprint dir under bmi/"; exit 1; }
 
 # Create a synthetic cache entry as if a previous build produced it.
-fake_pkg_dir="$MCPP_HOME/bmi/$fp_dir/deps/mcpp-index/fake.pkg@9.9.9"
+fake_pkg_dir="$MCPP_HOME/bmi/$fp_dir/deps/mcpplibs/fake.pkg@9.9.9"
 mkdir -p "$fake_pkg_dir/gcm.cache" "$fake_pkg_dir/obj"
 echo SYN > "$fake_pkg_dir/gcm.cache/fake.pkg.gcm"
 echo SYN > "$fake_pkg_dir/obj/fake.m.o"

tests/e2e/23_remove_update.sh

@@ -33,7 +33,7 @@ cat > mcpp.lock <<'EOF'
 version = 1
 [package.bar]
 version = "2.0.0"
-source  = "mcpp-index+https://example.com"
+source  = "mcpplibs+https://example.com"
 hash    = "sha256:placeholder"
 EOF
 

tests/e2e/32_semver_merge.sh

@@ -14,10 +14,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 
 # Index is needed since we exercise version-source deps.
 mkdir -p "$MCPP_HOME/registry/data"
-if [[ -d "$HOME/.mcpp/registry/data/mcpp-index" ]]; then
-    ln -sf "$HOME/.mcpp/registry/data/mcpp-index" \
-        "$MCPP_HOME/registry/data/mcpp-index"
-fi
+# Link pre-cached index data (may be under old "mcpp-index" or new "mcpplibs" name)
+for idx_name in mcpplibs mcpp-index; do
+    if [[ -d "$HOME/.mcpp/registry/data/$idx_name" ]]; then
+        ln -sf "$HOME/.mcpp/registry/data/$idx_name" \
+            "$MCPP_HOME/registry/data/$idx_name"
+    fi
+done
 # Pre-cached xpkg downloads so the test doesn't re-fetch the world.
 if [[ -d "$HOME/.mcpp/registry/data/xpkgs" ]]; then
     [[ -e "$MCPP_HOME/registry/data/xpkgs" ]] \

tests/e2e/33_multi_version_mangling.sh

@@ -18,10 +18,13 @@ source "$(dirname "$0")/_inherit_toolchain.sh"
 
 # Index + xpkgs need to be visible since we exercise version-source deps.
 mkdir -p "$MCPP_HOME/registry/data"
-if [[ -d "$HOME/.mcpp/registry/data/mcpp-index" ]]; then
-    ln -sf "$HOME/.mcpp/registry/data/mcpp-index" \
-        "$MCPP_HOME/registry/data/mcpp-index"
-fi
+# Link pre-cached index data (may be under old "mcpp-index" or new "mcpplibs" name)
+for idx_name in mcpplibs mcpp-index; do
+    if [[ -d "$HOME/.mcpp/registry/data/$idx_name" ]]; then
+        ln -sf "$HOME/.mcpp/registry/data/$idx_name" \
+            "$MCPP_HOME/registry/data/$idx_name"
+    fi
+done
 if [[ -d "$HOME/.mcpp/registry/data/xpkgs" ]]; then
     [[ -e "$MCPP_HOME/registry/data/xpkgs" ]] \
         || ln -sf "$HOME/.mcpp/registry/data/xpkgs" \

tests/unit/test_bmi_cache.cpp

@@ -28,7 +28,7 @@ CacheKey makeKey(const std::filesystem::path& home) {
     return CacheKey{
         .mcppHome    = home,
         .fingerprint = "deadbeef0123abcd",
-        .indexName   = "mcpp-index",
+        .indexName   = "mcpplibs",
         .packageName = "mcpplibs.cmdline",
         .version     = "0.0.1",
     };
@@ -44,7 +44,7 @@ void writeFile(const std::filesystem::path& p, std::string_view body) {
 TEST(BmiCache, KeyDirLayoutMatchesDocs26) {
     auto k = makeKey("/home/u/.mcpp");
     EXPECT_EQ(k.dir().string(),
-              "/home/u/.mcpp/bmi/deadbeef0123abcd/deps/mcpp-index/mcpplibs.cmdline@0.0.1");
+              "/home/u/.mcpp/bmi/deadbeef0123abcd/deps/mcpplibs/mcpplibs.cmdline@0.0.1");
     EXPECT_EQ(k.manifestFile().filename().string(), "manifest.txt");
     EXPECT_EQ(k.gcmDir().filename().string(),       "gcm.cache");
     EXPECT_EQ(k.objDir().filename().string(),       "obj");