From b388e080ad0fad4452573783049e9f3ba82bdf11 Mon Sep 17 00:00:00 2001
From: Richard Alpe <richard@bit42.se>
Date: Mon, 3 Mar 2025 14:10:00 +0100
Subject: [PATCH] test: fix image paths in test specifications (again)

{topdoc} is needed for asciidoctor to find the image during test
report generation.

This is the same functional change as 02d8288863e2 but with the
generation script actually updated. This was forgotten in the last
commit.

Signed-off-by: Richard Alpe <richard@bit42.se>
---
 test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc  | 2 +-
 test/case/ietf_interfaces/lag_basic/lag_basic.adoc      | 2 +-
 test/case/ietf_interfaces/lag_failure/lag_failure.adoc  | 2 +-
 test/case/infix_dhcp/server_subnets/server_subnets.adoc | 2 +-
 test/case/use_case/ospf_container/ospf_container.adoc   | 4 ++--
 test/spec/generate_spec.py                              | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc b/test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc
index c52ca63c..913f75e5 100644
--- a/test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc
+++ b/test/case/ietf_interfaces/bridge_vlan/bridge_vlan.adoc
@@ -5,7 +5,7 @@ which in turn untags one VLAN outisde a non-VLAN filtering bridge.
 
 .Logical network setup
 ifdef::topdoc[]
-image::../../test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg[]
+image::{topdoc}../../test/case/ietf_interfaces/bridge_vlan/bridge-vlan.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/case/ietf_interfaces/lag_basic/lag_basic.adoc b/test/case/ietf_interfaces/lag_basic/lag_basic.adoc
index 32fec881..f5d73866 100644
--- a/test/case/ietf_interfaces/lag_basic/lag_basic.adoc
+++ b/test/case/ietf_interfaces/lag_basic/lag_basic.adoc
@@ -5,7 +5,7 @@ modes during basic failure scenarios.
 
 .Internal network setup, PC verifies connectivity with dut2 via dut1
 ifdef::topdoc[]
-image::../../test/case/ietf_interfaces/lag_basic/lag-basic.svg[Internal networks]
+image::{topdoc}../../test/case/ietf_interfaces/lag_basic/lag-basic.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/case/ietf_interfaces/lag_failure/lag_failure.adoc b/test/case/ietf_interfaces/lag_failure/lag_failure.adoc
index 92fa04f6..c0caa57c 100644
--- a/test/case/ietf_interfaces/lag_failure/lag_failure.adoc
+++ b/test/case/ietf_interfaces/lag_failure/lag_failure.adoc
@@ -5,7 +5,7 @@ links stop forwarding traffic, without carrier loss.
 
 .Logical network setup, link breakers (lb1 & lb2) here managed by host PC
 ifdef::topdoc[]
-image::../../test/case/ietf_interfaces/lag_failure/lag-failure.svg[]
+image::{topdoc}../../test/case/ietf_interfaces/lag_failure/lag-failure.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/case/infix_dhcp/server_subnets/server_subnets.adoc b/test/case/infix_dhcp/server_subnets/server_subnets.adoc
index aa4e0e54..99c1a865 100644
--- a/test/case/infix_dhcp/server_subnets/server_subnets.adoc
+++ b/test/case/infix_dhcp/server_subnets/server_subnets.adoc
@@ -7,7 +7,7 @@ subnets.
 
 .Internal network setup, client2 and client3 are on the same LAN
 ifdef::topdoc[]
-image::../../test/case/infix_dhcp/server_subnets/dhcp-subnets.svg[Internal networks]
+image::{topdoc}../../test/case/infix_dhcp/server_subnets/dhcp-subnets.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/case/use_case/ospf_container/ospf_container.adoc b/test/case/use_case/ospf_container/ospf_container.adoc
index c6661941..09c9a60b 100644
--- a/test/case/use_case/ospf_container/ospf_container.adoc
+++ b/test/case/use_case/ospf_container/ospf_container.adoc
@@ -10,7 +10,7 @@ PC, which can act as a link breaker.
 .Use-case overview.
 [#img-overview]
 ifdef::topdoc[]
-image::../../test/case/use_case/ospf_container/overview.svg[]
+image::{topdoc}../../test/case/use_case/ospf_container/overview.svg[]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
@@ -51,7 +51,7 @@ second bridge, `br1`, only use IPv6 link-local addresses.
 .Internal network setup, here router R1 on subnet 10.1.1.1/24.
 [#img-setup]
 ifdef::topdoc[]
-image::../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
+image::{topdoc}../../test/case/use_case/ospf_container/internal-network.svg[Internal networks]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]
diff --git a/test/spec/generate_spec.py b/test/spec/generate_spec.py
index cb44be41..ee50e818 100755
--- a/test/spec/generate_spec.py
+++ b/test/spec/generate_spec.py
@@ -25,7 +25,7 @@ def replace_image_tag(text, test_dir):
         label = match.group("label")
 
         return f"""ifdef::topdoc[]
-image::../../{test_dir}/{image_name}[{label}]
+image::{{topdoc}}../../{test_dir}/{image_name}[{label}]
 endif::topdoc[]
 ifndef::topdoc[]
 ifdef::testgroup[]