Remove relative path import from test scripts

2 years ago · 5d746828ad
parent 353d92b1df
commit 5d746828ad
12 changed files with 18 additions and 15 deletions
--- a/12_integrated_testing/README.md
+++ b/12_integrated_testing/README.md
@ -1824,7 +1824,7 @@ diff -uNr 11_exceptions_part1_groundwork/tests/00_console_sanity.rb 12_integrate
 +#
 +# Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
 +
-+require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 +
 +# Verify sending and receiving works as expected.
 +class TxRxHandshakeTest < SubtestBase
@ -2022,7 +2022,7 @@ diff -uNr 11_exceptions_part1_groundwork/tests/03_exception_restore_sanity.rb 12
 +#
 +# Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
 +
-+require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 +
 +# Verify that exception restore works.
 +class ExceptionRestoreTest < SubtestBase
--- a/12_integrated_testing/tests/00_console_sanity.rb
+++ b/12_integrated_testing/tests/00_console_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify sending and receiving works as expected.
 class TxRxHandshakeTest < SubtestBase
--- a/12_integrated_testing/tests/03_exception_restore_sanity.rb
+++ b/12_integrated_testing/tests/03_exception_restore_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify that exception restore works.
 class ExceptionRestoreTest < SubtestBase
--- a/13_exceptions_part2_peripheral_IRQs/tests/00_console_sanity.rb
+++ b/13_exceptions_part2_peripheral_IRQs/tests/00_console_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify sending and receiving works as expected.
 class TxRxHandshakeTest < SubtestBase
--- a/13_exceptions_part2_peripheral_IRQs/tests/03_exception_restore_sanity.rb
+++ b/13_exceptions_part2_peripheral_IRQs/tests/03_exception_restore_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify that exception restore works.
 class ExceptionRestoreTest < SubtestBase
--- a/14_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rb
+++ b/14_virtual_mem_part2_mmio_remap/tests/00_console_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify sending and receiving works as expected.
 class TxRxHandshakeTest < SubtestBase
--- a/14_virtual_mem_part2_mmio_remap/tests/03_exception_restore_sanity.rb
+++ b/14_virtual_mem_part2_mmio_remap/tests/03_exception_restore_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify that exception restore works.
 class ExceptionRestoreTest < SubtestBase
--- a/15_virtual_mem_part3_precomputed_tables/tests/00_console_sanity.rb
+++ b/15_virtual_mem_part3_precomputed_tables/tests/00_console_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify sending and receiving works as expected.
 class TxRxHandshakeTest < SubtestBase
--- a/15_virtual_mem_part3_precomputed_tables/tests/03_exception_restore_sanity.rb
+++ b/15_virtual_mem_part3_precomputed_tables/tests/03_exception_restore_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify that exception restore works.
 class ExceptionRestoreTest < SubtestBase
--- a/16_virtual_mem_part4_higher_half_kernel/tests/00_console_sanity.rb
+++ b/16_virtual_mem_part4_higher_half_kernel/tests/00_console_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify sending and receiving works as expected.
 class TxRxHandshakeTest < SubtestBase
--- a/16_virtual_mem_part4_higher_half_kernel/tests/03_exception_restore_sanity.rb
+++ b/16_virtual_mem_part4_higher_half_kernel/tests/03_exception_restore_sanity.rb
@ -4,7 +4,7 @@
 #
 # Copyright (c) 2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative '../../common/tests/console_io_test'
+require 'console_io_test'
 # Verify that exception restore works.
 class ExceptionRestoreTest < SubtestBase
--- a/common/tests/dispatch.rb
+++ b/common/tests/dispatch.rb
@ -5,9 +5,12 @@
 #
 # Copyright (c) 2019-2022 Andre Richter <andre.o.richter@gmail.com>
-require_relative 'boot_test'
+file_dir = File.dirname(__FILE__)
-require_relative 'console_io_test'
+$LOAD_PATH.unshift(file_dir) unless $LOAD_PATH.include?(file_dir)
-require_relative 'exit_code_test'
+
 require 'boot_test'
 require 'console_io_test'
 require 'exit_code_test'
 qemu_cmd = ARGV.join(' ')
 binary = ARGV.last