tmp: develop's remaining tests on the shapes branch

Author: HaoZeke

tests/build_list_and_stack_diff.rs

@@ -1,14 +1,11 @@
 //! Integration tests: build-list order and markdown stack-diff via library + CLI.
 
-use eb_stack::{
-    classify_stack_diff, dep_map_from_universe, format_build_list, format_stack_diff_markdown,
-    ordered_build_paths, solve_from_easyconfigs_with_baseline_version_and_extras,
-    PackageChangeKind, SolveExtraOut, StackLock, Universe,
-};
+use eb_stack::{LockPackage, PackageChangeKind, STACK_LOCK_SCHEMA_VERSION, SolveExtraOut, SolverMeta, StackLock, Toolchain, Universe, classify_stack_diff, dep_map_from_universe, format_build_list, format_stack_diff_markdown, ordered_build_paths, ordered_packages, solve_from_easyconfigs_with_baseline_version_and_extras};
 use std::collections::BTreeSet;
 use std::path::PathBuf;
 use std::process::Command;
 
+
 fn fixture(rel: &str) -> PathBuf {
     PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("fixtures/gromacs_2025_to_next")
@@ -341,3 +338,52 @@ fn emit_reports_howto_matches_the_gromacs_solve() {
         "emit-reports.org stack diff drifted from the solve:\n{diff}"
     );
 }
+
+// Ported from develop: tests main lacked by name.
+
+#[test]
+fn ordered_packages_keeps_system_bootstrap_siblings() {
+    let system = Toolchain {
+        name: "system".into(),
+        version: "system".into(),
+    };
+    let lock_pkg = |name: &str, version: &str| LockPackage {
+        name: name.into(),
+        version: version.into(),
+        toolchain: system.clone(),
+        versionsuffix: None,
+        easyconfig_path: format!("{name}-{version}.eb"),
+    };
+    let lock = StackLock {
+        schema_version: STACK_LOCK_SCHEMA_VERSION,
+        toolchain: system.clone(),
+        generation_label: None,
+        packages: vec![
+            lock_pkg("binutils", "2.40"),
+            lock_pkg("binutils", "2.42"),
+            lock_pkg("Perl", "5.38.0"),
+        ],
+        solver: SolverMeta {
+            engine: "test".into(),
+            engine_version: "0".into(),
+            timestamp: "1970-01-01T00:00:00Z".into(),
+        },
+    };
+    let mut dep_map = std::collections::HashMap::new();
+    dep_map.insert("Perl".into(), vec!["binutils".into()]);
+    dep_map.insert("binutils".into(), vec!["Perl".into()]);
+    let ordered = ordered_packages(&lock, &dep_map);
+    let paths: Vec<&str> = ordered
+        .iter()
+        .map(|package| package.easyconfig_path.as_str())
+        .collect();
+    assert!(
+        paths.contains(&"binutils-2.40.eb"),
+        "missing SYSTEM binutils 2.40: {paths:?}"
+    );
+    assert!(
+        paths.contains(&"binutils-2.42.eb"),
+        "missing SYSTEM binutils 2.42: {paths:?}"
+    );
+    assert_eq!(ordered.len(), 3, "Perl plus both binutils rows: {paths:?}");
+}