From 56dd057ab47b627aa5d203482ac6a9cd94680299 Mon Sep 17 00:00:00 2001 From: Mohamed Gaber Date: Thu, 2 Jul 2026 18:56:25 +0300 Subject: [PATCH] test/ci fixes - fix incorrect repo_url output - fix parsing in test_splitnets to match new format - fix silimate-shell.nix referring to removed derivation --- .github/workflows/release.yml | 2 +- silimate-shell.nix | 1 - tests/various/test_splitnets.tcl | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1e3beaa3f..bfd7140e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -196,7 +196,7 @@ jobs: echo "short_sha=$SHORT_SHA" >> "$GITHUB_OUTPUT" echo "full_sha=$FULL_SHA" >> "$GITHUB_OUTPUT" echo "date=$DATE" >> "$GITHUB_OUTPUT" - echo "url=$REPO_URL" >> "$GITHUB_OUTPUT" + echo "repo_url=$REPO_URL" >> "$GITHUB_OUTPUT" rm -rf ./* ./.* - uses: actions/checkout@v6 with: diff --git a/silimate-shell.nix b/silimate-shell.nix index beef60ae6..01ac4b657 100644 --- a/silimate-shell.nix +++ b/silimate-shell.nix @@ -29,7 +29,6 @@ pkgs.mkShell { iverilog # tests gtkwave # vcd2fst (python3.withPackages(ps: with ps; [pip wheel pybind11 cxxheaderparser])) - gnu-ar gtest ] ++ lib.optionals stdenv.isLinux [ elfutils # provides libdw.so (not to be confused with libdwarf.so) diff --git a/tests/various/test_splitnets.tcl b/tests/various/test_splitnets.tcl index 9cb2b4305..21b10641b 100644 --- a/tests/various/test_splitnets.tcl +++ b/tests/various/test_splitnets.tcl @@ -7,10 +7,10 @@ proc read_stats { file } { set ports 0 set nets 0 foreach line [split $result "\n"] { - if [regexp {Number of wires:[ \t]+([0-9]+)} $line tmp n] { + if [regexp {\s([0-9]+) wires} $line tmp n] { set nets [expr $nets + $n] } - if [regexp {Number of ports:[ \t]+([0-9]+)} $line tmp n] { + if [regexp {(\s[0-9]+) ports} $line tmp n] { set ports [expr $ports + $n] } }