diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-10-10 23:30:18 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-10-10 23:30:18 -0500 |
| commit | 615278f3365087e436ee5ea13e0d15bd60718038 (patch) | |
| tree | 9b67e19184a743c0ee3672b6266b281a6d7e8799 /tests/fixtures | |
| parent | 8bb3f48cb970a410d93940c675c4a086af9fbcdd (diff) | |
| download | horizon-615278f3365087e436ee5ea13e0d15bd60718038.tar.gz horizon-615278f3365087e436ee5ea13e0d15bd60718038.tar.bz2 horizon-615278f3365087e436ee5ea13e0d15bd60718038.tar.xz horizon-615278f3365087e436ee5ea13e0d15bd60718038.zip | |
hscript: Allow multiple inheritance
This allows a HorizonScript to inherit from multiple files. Files are parsed
in a system-defined, unspecified order, but all scripts of a given depth are
guaranteed to be parsed before the next depth.
Diffstat (limited to 'tests/fixtures')
5 files changed, 10 insertions, 5 deletions
diff --git a/tests/fixtures/0232-inherit-basic.installfile b/tests/fixtures/0232-inherit-basic.installfile index 64a4c6a..2e65f1e 100644 --- a/tests/fixtures/0232-inherit-basic.installfile +++ b/tests/fixtures/0232-inherit-basic.installfile @@ -1,3 +1,3 @@ arch ppc64 pkginstall kde x11 -inherit 0222-complete.installfile +inherit ../../fixtures/0222-complete.installfile diff --git a/tests/fixtures/0236-inherit-relative.installfile b/tests/fixtures/0236-inherit-relative.installfile index eb6fe27..1e2e9d1 100644 --- a/tests/fixtures/0236-inherit-relative.installfile +++ b/tests/fixtures/0236-inherit-relative.installfile @@ -1,2 +1,2 @@ arch ppc64 -inherit ../fixtures/0222-complete.installfile +inherit ../../fixtures/0222-complete.installfile diff --git a/tests/fixtures/0237-inherit-incomplete.installfile b/tests/fixtures/0237-inherit-incomplete.installfile index a4b1309..dd99b5d 100644 --- a/tests/fixtures/0237-inherit-incomplete.installfile +++ b/tests/fixtures/0237-inherit-incomplete.installfile @@ -1,2 +1,2 @@ arch ppc64 -inherit 0006-no-network.installfile +inherit ../../fixtures/0006-no-network.installfile diff --git a/tests/fixtures/0238-inherit-override.installfile b/tests/fixtures/0238-inherit-override.installfile index 161e8f8..14e8b06 100644 --- a/tests/fixtures/0238-inherit-override.installfile +++ b/tests/fixtures/0238-inherit-override.installfile @@ -1,3 +1,3 @@ arch ppc64 -hostname overriden.hostname.local -inherit 0222-complete.installfile +hostname overridden.hostname.local +inherit ../../fixtures/0222-complete.installfile diff --git a/tests/fixtures/0264-inherit-test-loop.installfile b/tests/fixtures/0264-inherit-test-loop.installfile new file mode 100644 index 0000000..510264a --- /dev/null +++ b/tests/fixtures/0264-inherit-test-loop.installfile @@ -0,0 +1,5 @@ +# Because of the fact we need to use relative paths, +# and because of the fact RSpec copies the first installfile to tmp/aruba, +# and because the first loop has to reference the second and vis versa, +# we need a 'stub' that kicks the loop off. +inherit ../../fixtures/0234-inherit-loop1.installfile |