diff --git a/tests/10-socket.t b/tests/10-socket.t index 02c5cfe..0f7b858 100644 --- a/tests/10-socket.t +++ b/tests/10-socket.t @@ -23,6 +23,7 @@ use FindBin; use lib "$FindBin::Bin/lib/"; use IPXWrapper::DOSBoxServer; +use IPXWrapper::Tool::OSVersion; use IPXWrapper::Util; require "$FindBin::Bin/config.pm"; @@ -117,6 +118,12 @@ describe "IPXWrapper" => sub describe "using Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip Ethernet encapsulation tests under Windows 98 + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); diff --git a/tests/15-interfaces.t b/tests/15-interfaces.t index 243dd24..fd47ead 100644 --- a/tests/15-interfaces.t +++ b/tests/15-interfaces.t @@ -24,6 +24,7 @@ use lib "$FindBin::Bin/lib/"; use IPXWrapper::DOSBoxServer; use IPXWrapper::Tool::Bind; +use IPXWrapper::Tool::OSVersion; use IPXWrapper::Util; require "$FindBin::Bin/config.pm"; @@ -175,6 +176,13 @@ describe "IPXWrapper" => sub describe "using Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98 + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); @@ -206,6 +214,13 @@ describe "IPXWrapper" => sub describe "using Novell Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98 + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); @@ -237,6 +252,13 @@ describe "IPXWrapper" => sub describe "using LLC (802.2) Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98 + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); diff --git a/tests/30-eth-ipx.t b/tests/30-eth-ipx.t index 2e21130..5fa2610 100644 --- a/tests/30-eth-ipx.t +++ b/tests/30-eth-ipx.t @@ -1,5 +1,5 @@ # IPXWrapper test suite -# Copyright (C) 2014-2017 Daniel Collins +# Copyright (C) 2014-2024 Daniel Collins # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 as published by @@ -26,6 +26,7 @@ use IPXWrapper::Capture::IPX; use IPXWrapper::Capture::IPXLLC; use IPXWrapper::Capture::IPXNovell; use IPXWrapper::Tool::IPXRecv; +use IPXWrapper::Tool::OSVersion; use IPXWrapper::Util; require "$FindBin::Bin/config.pm"; @@ -623,6 +624,13 @@ shared_examples_for "ipx over ethernet" => sub describe "IPXWrapper using Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98. + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); @@ -641,6 +649,13 @@ describe "IPXWrapper using Ethernet encapsulation" => sub describe "IPXWrapper using Novell Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98. + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper"); @@ -659,6 +674,13 @@ describe "IPXWrapper using Novell Ethernet encapsulation" => sub describe "IPXWrapper using LLC (802.2) Ethernet encapsulation" => sub { + if(!IPXWrapper::Tool::OSVersion->get($remote_ip_a)->platform_is_winnt()) + { + # Skip these tests under Windows 98. + it "(not implemented)"; + return; + } + before all => sub { reg_delete_key($remote_ip_a, "HKCU\\Software\\IPXWrapper");