diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-18 11:54:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-06-18 11:54:20 +0000 |
| commit | ecbbcfd4c7093c7ad0151bcc0db43ef615d66259 (patch) | |
| tree | c7559ffdaf40a8908e9fd440c04ebd35f0f94d8c | |
| parent | a5f014c173362ac2af00648d1184575a91522acd (diff) | |
| parent | a0955b86cd77e22e80846428a5065e871b6d8eb8 (diff) | |
| download | illumos-joyent-ecbbcfd4c7093c7ad0151bcc0db43ef615d66259.tar.gz | |
[illumos-gate merge]
commit a0955b86cd77e22e80846428a5065e871b6d8eb8
9600 LDT still not happy under KPTI
Conflicts:
usr/src/test/os-tests/tests/Makefile
usr/src/test/os-tests/runfiles/default.run
| -rw-r--r-- | usr/src/test/os-tests/tests/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/test/test-runner/cmd/run | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/test/os-tests/tests/Makefile b/usr/src/test/os-tests/tests/Makefile index 34ad160684..0c9c55f633 100644 --- a/usr/src/test/os-tests/tests/Makefile +++ b/usr/src/test/os-tests/tests/Makefile @@ -14,7 +14,6 @@ # Copyright 2018 Joyent, Inc. # - SUBDIRS_i386 = i386 SUBDIRS = poll secflags sigqueue spoof-ras sdevfs sockfs stress timer tmpfs \ diff --git a/usr/src/test/test-runner/cmd/run b/usr/src/test/test-runner/cmd/run index 6b76686fe0..779141692e 100644 --- a/usr/src/test/test-runner/cmd/run +++ b/usr/src/test/test-runner/cmd/run @@ -15,6 +15,7 @@ # Copyright 2018 Joyent, Inc. # Copyright (c) 2012, 2016 by Delphix. All rights reserved. # Copyright (c) 2017, Chris Fraire <cfraire@me.com>. +# Copyright 2018 Joyent, Inc. # import ConfigParser |