summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2016-05-16 14:21:25 (GMT)
committerTomeu Vizoso <tomeu.vizoso@collabora.com>2016-05-16 14:21:25 (GMT)
commitdec2350a66ccb9df3d17c4b82301f63e7aa5f4cf (patch)
tree2a28f93041de94402e383b9fc6f5a3e3bed85785
parent49e1055a667f9cdc028dfb9b8e12f4f974a12d77 (diff)
downloadtest-definitions-dec2350a66ccb9df3d17c4b82301f63e7aa5f4cf.tar.gz
test-definitions-dec2350a66ccb9df3d17c4b82301f63e7aa5f4cf.tar.xz
Revert "igt"
This reverts commit 49e1055a667f9cdc028dfb9b8e12f4f974a12d77.
-rw-r--r--kernel/igt/igt-chamelium.yaml22
-rw-r--r--kernel/igt/igt-jenkins.yaml25
-rw-r--r--kernel/igt/igt-wait-mux.yaml17
-rw-r--r--kernel/igt/igt.json116
-rw-r--r--kernel/igt/igt.yaml22
-rw-r--r--kernel/igt/libdrm-jenkins.yaml25
-rwxr-xr-xkernel/igt/scripts/basic-tests.sh34
-rw-r--r--kernel/igt/scripts/dell-u2415h-1080p.edidbin256 -> 0 bytes
-rwxr-xr-xkernel/igt/scripts/plug-chamelium.py68
9 files changed, 0 insertions, 329 deletions
diff --git a/kernel/igt/igt-chamelium.yaml b/kernel/igt/igt-chamelium.yaml
deleted file mode 100644
index ef18b4b..0000000
--- a/kernel/igt/igt-chamelium.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-metadata:
- name: gfx-tests-chamelium-mux
- format: "Lava-Test-Shell Test Definition 1.0"
- description: "Test basic Kernel Mode Setting functionality"
- maintainer:
- - tomeu.vizoso@collabora.com
- scope:
- - functional
- devices:
- - chamelium
- environment:
- - lava-test-shell
-
-run:
- steps:
- - lava-wait dut-connected
- - echo -n $(lava-group dut) $(lava-group chamelium) | nc $MUX_HOST $MUX_PORT
- - lava-send mux-switched
- - lava-wait client-done
-
-parse:
- pattern: '(?P<test_case_id>\S*):\s+(?P<result>(pass|fail))'
diff --git a/kernel/igt/igt-jenkins.yaml b/kernel/igt/igt-jenkins.yaml
deleted file mode 100644
index 99eb563..0000000
--- a/kernel/igt/igt-jenkins.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-- job:
- name: 'IGT-ARM'
- project-type: freestyle
- disabled: false
- display-name: 'IGT on ARM'
- node: build-igt-armhf
- scm:
- - git:
- url: git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
- browser: cgit
- browser-url: https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/
- branches:
- - origin/master
-
- builders:
- - shell: wget https://jenkins.freedesktop.org/job/libdrm/6/artifact/libdrm-for-igt.tar.gz
- - shell: tar xvfz libdrm-for-igt.tar.gz
- - shell: PKG_CONFIG_PATH=/scratch/jenkins/jenkins-fdo/workspace/IGT-ARM/libdrm-build/lib/pkgconfig ./autogen.sh && make -j4
- - shell: tar cvfz igt-for-arm.tar.gz tests/core_auth tests/core_get_client_auth tests/core_getclient tests/core_getstats tests/core_getversion tests/core_prop_blob tests/core_setmaster_vs_auth tests/drm_read tests/kms_addfb_basic tests/kms_atomic tests/kms_flip_event_leak tests/kms_setmode tests/kms_vblank tests/kms_render tests/kms_flip
-
-
- publishers:
- - archive:
- artifacts: 'igt-for-arm.tar.gz'
- fingerprint: true
diff --git a/kernel/igt/igt-wait-mux.yaml b/kernel/igt/igt-wait-mux.yaml
deleted file mode 100644
index 4fb29aa..0000000
--- a/kernel/igt/igt-wait-mux.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-metadata:
- name: igt-wait-mux
- format: "Lava-Test-Shell Test Definition 1.0"
- description: "Run IGT tests."
- maintainer:
- - tomeu.vizoso@collabora.com
- scope:
- - functional
- environment:
- - lava-test-shell
-
-run:
- steps:
- - lava-send dut-connected
- - lava-wait mux-switched
- - ./kernel/igt/scripts/plug-chamelium.py "$device_type" $(lava-group chamelium) "$CHAMELIUM_PORT"
-
diff --git a/kernel/igt/igt.json b/kernel/igt/igt.json
deleted file mode 100644
index b05e84d..0000000
--- a/kernel/igt/igt.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
- "device_group": [
- {
- "role": "chamelium",
- "count": 1,
- "device_type": "chamelium"
- },
- {
- "role": "dut",
- "count": 1,
- "device_type": "{{lava_device_type}}",
- "tags": [
- "chamelium-hdmi"
- ]
- }
- ],
- "actions": [
- {
- "command": "dummy_deploy",
- "parameters": {
- "role": "chamelium",
- "target_type": "oe"
- }
- },
- {
- "command": "lava_test_shell",
- "parameters": {
- "role": "chamelium",
- "testdef_repos": [
- {
- "git-repo": "git://git.collabora.co.uk/git/user/tomeu/test-definitions.git",
- "testdef": "kernel/igt/igt-chamelium.yaml",
- "parameters": {
- "MUX_HOST": "hdmi-mux-cbg-0",
- "MUX_PORT": "3199"
- }
- }
- ],
- "timeout": 10000
- }
- },
- {
- "command": "deploy_kernel",
- "parameters": {
- "role": "dut",
- "dtb": "{{kernbase}}/dtbs/{{fdtfile}}.dtb",
- "kernel": "{{kernbase}}/zImage",
- "nfsrootfs": "http://images.collabora.co.uk/lava/ceti/ospack-armhf-core.tar.gz",
- "overlays": [
- "{{kernbase}}/modules.tar.xz"
- ],
- "login_commands": [
- "sudo su"
- ],
- "login_prompt": "login:",
- "password": "collabora",
- "password_prompt": "Password:",
- "username": "collabora"
- }
- },
- {
- "command": "boot_image",
- "parameters": {
- "role": "dut",
- "test_image_prompt": "root@singularity"
- }
- },
- {
- "command": "lava_test_shell",
- "parameters": {
- "role": "dut",
- "testdef_repos": [
- {
- "git-repo": "git://git.collabora.co.uk/git/user/tomeu/test-definitions.git",
- "parameters": {
- "CHAMELIUM_PORT": "HDMI-A-1:HDMI",
- "device_type": "rk3288-rock2-square"
- },
- "testdef": "kernel/igt/igt-wait-mux.yaml"
- }
- ],
- "timeout": 360
- }
- },
- {
- "command": "lava_test_shell",
- "parameters": {
- "role": "dut",
- "testdef_repos": [
- {
- "git-repo": "git://git.collabora.co.uk/git/user/tomeu/test-definitions.git",
- "parameters": {
- "CHAMELIUM_PORT": "HDMI-A-1:HDMI",
- "device_type": "rk3288-rock2-square"
- },
- "testdef": "kernel/igt/igt.yaml"
- }
- ],
- "timeout": 10000
- }
- },
- {
- "command": "submit_results",
- "parameters": {
- "server": "https://lava.collabora.co.uk/RPC2/",
- "stream": "{{bundle_stream}}"
- }
- }
- ],
- "device_type": "{{lava_device_type}}",
- "job_name": "igt-{{lava_device_type}}",
- "tags": [
- "chamelium-hdmi"
- ],
- "timeout": 10000
-}
diff --git a/kernel/igt/igt.yaml b/kernel/igt/igt.yaml
deleted file mode 100644
index 4e9258e..0000000
--- a/kernel/igt/igt.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-metadata:
- name: igt
- format: "Lava-Test-Shell Test Definition 1.0"
- description: "Run IGT tests."
- maintainer:
- - tomeu.vizoso@collabora.com
- scope:
- - functional
- environment:
- - lava-test-shell
-
-run:
- steps:
- - lava-test-case igt --shell ./kernel/igt/scripts/basic-tests.sh
- - lava-send client-done
-
-parse:
- pattern: 'Subtest (?P<test_case_id>\S*):\s+(?P<result>(SUCCESS|FAIL|SKIP))'
- fixupdict:
- SUCCESS: pass
- FAIL: fail
- SKIP: skip
diff --git a/kernel/igt/libdrm-jenkins.yaml b/kernel/igt/libdrm-jenkins.yaml
deleted file mode 100644
index 2c6658f..0000000
--- a/kernel/igt/libdrm-jenkins.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-- job:
- name: 'libdrm'
- project-type: freestyle
- disabled: false
- display-name: 'libdrm'
- node: build-igt-armhf
- scm:
- - git:
- url: git://anongit.freedesktop.org/mesa/drm
- browser: cgit
- browser-url: https://cgit.freedesktop.org/mesa/drm
- branches:
- - origin/master
-
- builders:
- - shell: ./autogen.sh --enable-intel --prefix=/scratch/jenkins/jenkins-fdo/workspace/libdrm/libdrm-build/
- - shell: make -j
- - shell: make install
- - shell: cp tests/modetest/.libs/modetest libdrm-build/.
- - shell: tar cvfz libdrm-for-igt.tar.gz libdrm-build/
-
- publishers:
- - archive:
- artifacts: 'libdrm-for-igt.tar.gz'
- fingerprint: true
diff --git a/kernel/igt/scripts/basic-tests.sh b/kernel/igt/scripts/basic-tests.sh
deleted file mode 100755
index a1bb476..0000000
--- a/kernel/igt/scripts/basic-tests.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-sudo apt-get install libpciaccess0 libunwind8
-
-wget --no-check-certificate https://jenkins.freedesktop.org/job/libdrm/10/artifact/libdrm-for-igt.tar.gz
-tar xfzv libdrm-for-igt.tar.gz
-export LD_LIBRARY_PATH=libdrm-build/lib
-
-ls -l /dev/dri/
-libdrm-build/modetest
-
-wget --no-check-certificate https://jenkins.freedesktop.org/job/IGT-ARM/9/artifact/igt-for-arm.tar.gz
-tar xfzv igt-for-arm.tar.gz
-
-TESTS="
-core_auth
-core_get_client_auth
-core_getclient
-core_getstats
-core_getversion
-core_prop_blob
-core_setmaster_vs_auth
-drm_read
-kms_addfb_basic
-kms_atomic
-kms_flip_event_leak
-kms_setmode
-kms_vblank
-kms_render
-kms_flip
-"
-
-for test in $TESTS; do
- tests/$test | sed "s/Subtest /Subtest $test@/g"
-done
-
diff --git a/kernel/igt/scripts/dell-u2415h-1080p.edid b/kernel/igt/scripts/dell-u2415h-1080p.edid
deleted file mode 100644
index 11990ad..0000000
--- a/kernel/igt/scripts/dell-u2415h-1080p.edid
+++ /dev/null
Binary files differ
diff --git a/kernel/igt/scripts/plug-chamelium.py b/kernel/igt/scripts/plug-chamelium.py
deleted file mode 100755
index 610f6d1..0000000
--- a/kernel/igt/scripts/plug-chamelium.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-#
-# plug-chamelium.py: Configure chamelium board to emulate a HDMI connection
-#
-# Copyright © 2016 Collabora, Ltd.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-# Original author: Daniel Stone <daniels@collabora.com>
-# Author: Tomeu Vizoso <tomeu.vizoso@collabora.com>
-
-import os, sys
-
-import xmlrpclib
-
-if __name__ == "__main__":
- device_name = sys.argv[1]
-
- chamelium_server = "http://%s:9992" % sys.argv[2]
- chamelium_port = sys.argv[3]
-
- (port_local, port_remote) = chamelium_port.split(":")
-
- chamelium = xmlrpclib.Server(chamelium_server)
-
- remote_input = -1
- for i in chamelium.GetSupportedInputs():
- if not chamelium.HasVideoSupport(i) or not chamelium.IsPhysicalPlugged(i):
- continue
- if chamelium.GetConnectorType(i) == port_remote:
- remote_input = i
- break
-
- assert(remote_input != -1)
-
- # Unplug now to force a HPD event after applying the EDID
- chamelium.Unplug(remote_input)
- chamelium.SetDdcState(remote_input, False)
-
- with open("%s/dell-u2415h-1080p.edid" % os.path.dirname(sys.argv[0]), "r") as edid_file:
- edid_bin = xmlrpclib.Binary(edid_file.read())
- edid_id = chamelium.CreateEdid(edid_bin)
- chamelium.ApplyEdid(remote_input, edid_id)
- chamelium.DestroyEdid(edid_id)
-
- chamelium.SetDdcState(remote_input, True)
- chamelium.Plug(remote_input)
-
- sys.exit(0)
-