[ocl-icd] 01/05: Imported Upstream version 2.2.9
Vincent Danjean
vdanjean at debian.org
Thu Mar 3 09:54:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
vdanjean pushed a commit to branch master
in repository ocl-icd.
commit 5a6aaf054d7ee1ef0a277ec5d6dd535ae89388ff
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date: Thu Mar 3 10:36:43 2016 +0100
Imported Upstream version 2.2.9
---
NEWS | 10 +
config.h.in | 3 +
configure | 25 +-
configure.ac | 4 +-
doc/libOpenCL.7.txt | 25 +-
ocl_icd_loader.c | 15 +-
tests/Makefile.am | 2 +
tests/Makefile.in | 2 +
tests/package.m4 | 6 +-
tests/testsuite | 610 ++++++++++++++++++++++++++++++++++----------
tests/testsuite-standard.at | 46 +++-
11 files changed, 590 insertions(+), 158 deletions(-)
diff --git a/NEWS b/NEWS
index bd2bd0f..afba639 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,16 @@
Version 2.2.8
=============
+Brice Videau (1):
+ Update clGetICDLoaderInfoOCLICD to report version 2.1.
+
+Vincent Danjean (3):
+ Report the correct supported OpenCL version when asked
+ Add support for OPENCL_VENDOR_PATH envvar
+ Release 2.2.9
+
+Version 2.2.8
+=============
Brice Videau (10):
Added missing EGL entries.
Added missing clGetKernelSubGroupInfoKHR.
diff --git a/config.h.in b/config.h.in
index e78c704..e767403 100644
--- a/config.h.in
+++ b/config.h.in
@@ -57,6 +57,9 @@
*/
#undef LT_OBJDIR
+/* supported OpenCL version */
+#undef OCL_ICD_OPENCL_VERSION
+
/* Name of package */
#undef PACKAGE
diff --git a/configure b/configure
index f9c728e..00cc2d9 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.8.
+# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.9.
#
# Report bugs to <ocl-icd-devel at lists.forge.imag.fr>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='OpenCL ICD Loader'
PACKAGE_TARNAME='ocl-icd'
-PACKAGE_VERSION='2.2.8'
-PACKAGE_STRING='OpenCL ICD Loader 2.2.8'
+PACKAGE_VERSION='2.2.9'
+PACKAGE_STRING='OpenCL ICD Loader 2.2.9'
PACKAGE_BUGREPORT='ocl-icd-devel at lists.forge.imag.fr'
PACKAGE_URL=''
@@ -1341,7 +1341,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures OpenCL ICD Loader 2.2.8 to adapt to many kinds of systems.
+\`configure' configures OpenCL ICD Loader 2.2.9 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1412,7 +1412,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.8:";;
+ short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.9:";;
esac
cat <<\_ACEOF
@@ -1529,7 +1529,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenCL ICD Loader configure 2.2.8
+OpenCL ICD Loader configure 2.2.9
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1952,7 +1952,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by OpenCL ICD Loader $as_me 2.2.8, which was
+It was created by OpenCL ICD Loader $as_me 2.2.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2819,7 +2819,7 @@ fi
# Define the identity of the package.
PACKAGE='ocl-icd'
- VERSION='2.2.8'
+ VERSION='2.2.9'
cat >>confdefs.h <<_ACEOF
@@ -11855,6 +11855,11 @@ ac_config_commands="$ac_config_commands tests/atconfig"
OPENCL_VERSION="2.1"
+cat >>confdefs.h <<_ACEOF
+#define OCL_ICD_OPENCL_VERSION "$OPENCL_VERSION"
+_ACEOF
+
+
# Checks for programs.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -13566,7 +13571,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by OpenCL ICD Loader $as_me 2.2.8, which was
+This file was extended by OpenCL ICD Loader $as_me 2.2.9, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13632,7 +13637,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-OpenCL ICD Loader config.status 2.2.8
+OpenCL ICD Loader config.status 2.2.9
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index e321391..264d6e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@
AC_PREREQ([2.67])
-AC_INIT([OpenCL ICD Loader], [2.2.8], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
+AC_INIT([OpenCL ICD Loader], [2.2.9], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
AC_CONFIG_SRCDIR([ocl_icd_loader.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
@@ -21,6 +21,8 @@ AC_CONFIG_TESTDIR([tests], [.])
m4_define([REQ_OPENCL_VERSION],[2_1])
OPENCL_VERSION="m4_translit(REQ_OPENCL_VERSION, [_], [.])"
AC_SUBST([OPENCL_VERSION])
+AC_DEFINE_UNQUOTED([OCL_ICD_OPENCL_VERSION], ["$OPENCL_VERSION"],
+ [supported OpenCL version])
# Checks for programs.
AC_PROG_CC_C89
diff --git a/doc/libOpenCL.7.txt b/doc/libOpenCL.7.txt
index 73fff41..21d2590 100644
--- a/doc/libOpenCL.7.txt
+++ b/doc/libOpenCL.7.txt
@@ -24,15 +24,21 @@ looks for files into '`/etc/OpenCL/vendors/`' directory and, for each file
whose name ends with '`.icd`', the ICD Loader loads with **dlopen**(3) the
shared library whose name is on the first line of the '`.icd`' file.
-Shared library name in ".icd" files can have its path, or it can be a plain
-filename. In the latter case, the ICD shared library will be look for into the
-standard dynamic loader paths.
+Each shared library name in ".icd" files can have its path, or it can be a plain
+filename. In the latter case, the ICD shared library will be looked for into the
+standard dynamic library loader paths.
ENVIRONMENT
-------------
Some environment variables can be used modify the default behavior of
libOpenCL.
+*OPENCL_VENDOR_PATH*::
+This variable allows one to modify the defaut '`/etc/OpenCL/vendors/`' path.
+It is compatible with some other ICD loaders (but not all of them, as the
+variable is not part of the standard). Note that *$OCL_ICD_VENDORS* (see below)
+is used in priority if defined and not empty.
+
*OCL_ICD_VENDORS*::
This variable allows one to change the way ICD are searched on the system.
Several cases are considered:
@@ -44,10 +50,13 @@ b. else, if *$OCL_ICD_VENDORS* ends with '`.icd`', libOpenCL.so will only load
the ICD whose shared library name is wrote into the specified ".icd"
file;
+
- If there is no slash into
+ If there is no slashes into
*$OCL_ICD_VENDORS*, libOpenCL.so will first try to use
- '`/etc/OpenCL/vendors/`'*$OCL_ICD_VENDORS*. If this fail, it uses
- *$OCL_ICD_VENDORS* (as a relative or absolute file name path).
+ '`/etc/OpenCL/vendors/`'*$OCL_ICD_VENDORS* (or
+ *$OPENCL_VENDOR_PATH*'`/`'*$OCL_ICD_VENDORS* if *OPENCL_VENDOR_PATH* is
+ defined).
+ If this fail or if there are shashes, it uses *$OCL_ICD_VENDORS* (as a
+ relative or absolute file name path).
c. else libOpenCL.so will try to load *$OCL_ICD_VENDORS* as the ICD shared
library itself (i.e. to load it directly with **dlopen**(3)).
@@ -64,11 +73,11 @@ through **clGetPlatformIDs**(3). Current provided algorithms are:
* *devices*: first, list platforms that support most GPU, then most CPU then
most accelerators. If *OCL_ICD_PLATFORM_SORT* is not set or set to an
unknown value, this algorithm is used.
-* *none*: no sort is done and the order can very at each run.
+* *none*: no sort is done and the order can change at each run.
*OCL_ICD_DEFAULT_PLATFORM*::
Number of the platform to choose as defaut platform. Note that using this
-environment variable without specifying a sort algorithm for platforms
+environment variable without ensuring the use of a sort algorithm for platforms
is not really useful.
*OCL_ICD_DEBUG*::
diff --git a/ocl_icd_loader.c b/ocl_icd_loader.c
index 5b3a83a..e42ed3f 100644
--- a/ocl_icd_loader.c
+++ b/ocl_icd_loader.c
@@ -514,9 +514,16 @@ static void __initClIcd( void ) {
int is_dir = 0;
DIR *dir = NULL;
const char* dir_path=getenv("OCL_ICD_VENDORS");
+ const char* vendor_path=getenv("OPENCL_VENDOR_PATH");
+ if (! vendor_path || vendor_path[0]==0) {
+ vendor_path=ETC_OPENCL_VENDORS;
+ debug(D_DUMP, "OPENCL_VENDOR_PATH unset or empty. Using hard-coded path '%s'", vendor_path);
+ } else {
+ debug(D_DUMP, "OPENCL_VENDOR_PATH set to '%s', using it", vendor_path);
+ }
if (! dir_path || dir_path[0]==0) {
- debug(D_DUMP, "OCL_ICD_VENDORS empty or not defined, using %s", ETC_OPENCL_VENDORS);
- dir_path=ETC_OPENCL_VENDORS;
+ dir_path=vendor_path;
+ debug(D_DUMP, "OCL_ICD_VENDORS empty or not defined, using vendors path '%s'", dir_path);
is_dir=1;
}
if (!is_dir) {
@@ -560,7 +567,7 @@ static void __initClIcd( void ) {
if (_string_end_with_icd(dir_path)) {
num_icds = 0;
if (! _string_with_slash(dir_path)) {
- num_icds = _open_driver(0, ETC_OPENCL_VENDORS, dir_path);
+ num_icds = _open_driver(0, vendor_path, dir_path);
}
if (num_icds == 0) {
num_icds = _open_driver(0, NULL, dir_path);
@@ -698,7 +705,7 @@ static cl_int clGetICDLoaderInfoOCLICD(
void * param_value,
size_t * param_value_size_ret)
{
- char cl_icdl_ocl_version[] = "OpenCL 1.2";
+ char cl_icdl_ocl_version[] = "OpenCL " OCL_ICD_OPENCL_VERSION;
char cl_icdl_version[] = PACKAGE_VERSION;
char cl_icdl_name[] = PACKAGE_NAME;
char cl_icdl_vendor[] = "OCL Icd free software";
diff --git a/tests/Makefile.am b/tests/Makefile.am
index afdb159..58d2492 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,6 +15,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo ' [$(PACKAGE_BUGREPORT)])'; \
echo 'm4_define([AT_PACKAGE_URL],' && \
echo ' [$(PACKAGE_URL)])'; \
+ echo 'm4_define([AT_PACKAGE_OPENCL_VERSION],' && \
+ echo ' [$(OPENCL_VERSION)])'; \
} >'$(srcdir)/package.m4'
TESTSUITES_SRC = testsuite.at testsuite-standard.at testsuite-workaround.at testsuite-default-platform.at
diff --git a/tests/Makefile.in b/tests/Makefile.in
index ab5cb68..2161b11 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -468,6 +468,8 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo ' [$(PACKAGE_BUGREPORT)])'; \
echo 'm4_define([AT_PACKAGE_URL],' && \
echo ' [$(PACKAGE_URL)])'; \
+ echo 'm4_define([AT_PACKAGE_OPENCL_VERSION],' && \
+ echo ' [$(OPENCL_VERSION)])'; \
} >'$(srcdir)/package.m4'
check-local: atconfig atlocal $(TESTSUITE)
diff --git a/tests/package.m4 b/tests/package.m4
index 4e0b7be..d97368f 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -4,10 +4,12 @@ m4_define([AT_PACKAGE_NAME],
m4_define([AT_PACKAGE_TARNAME],
[ocl-icd])
m4_define([AT_PACKAGE_VERSION],
- [2.2.8])
+ [2.2.9])
m4_define([AT_PACKAGE_STRING],
- [OpenCL ICD Loader 2.2.8])
+ [OpenCL ICD Loader 2.2.9])
m4_define([AT_PACKAGE_BUGREPORT],
[ocl-icd-devel at lists.forge.imag.fr])
m4_define([AT_PACKAGE_URL],
[])
+m4_define([AT_PACKAGE_OPENCL_VERSION],
+ [2.1])
diff --git a/tests/testsuite b/tests/testsuite
index dc5f80c..386ba7e 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -594,27 +594,32 @@ at_help_all="1;testsuite-standard.at:3;invalid OCL_ICD_VENDORS;;
2;testsuite-standard.at:10;OCL_ICD_VENDORS as directory;;
3;testsuite-standard.at:21;OCL_ICD_VENDORS as library file;;
4;testsuite-standard.at:29;OCL_ICD_VENDORS as ICD file (.icd);;
-5;testsuite-standard.at:37;Our dummy ICD through our ICD loader;;
-6;testsuite-standard.at:48;ICD Loader extension;;
-7;testsuite-default-platform.at:3;No choice, among 0 => CL_INVALID_PLATFORM;;
-8;testsuite-default-platform.at:15;Choice 0, among 0 => CL_INVALID_PLATFORM;;
-9;testsuite-default-platform.at:26;Choice 1, among 0 => CL_INVALID_PLATFORM;;
-10;testsuite-default-platform.at:37;No choice, among 1 => default platform;;
-11;testsuite-default-platform.at:49;Choice 0, among 1 => default platform;;
-12;testsuite-default-platform.at:61;Choice 1, among 1 => CL_INVALID_PLATFORM;;
-13;testsuite-default-platform.at:73;No choice, among 2 => one platform;;
-14;testsuite-default-platform.at:90;Choice 0, among 2 => first platform;;
-15;testsuite-default-platform.at:101;Choice 1, among 2 => second platform;;
-16;testsuite-default-platform.at:112;Choice 2, among 2 => CL_INVALID_PLATFORM;;
-17;testsuite-default-platform.at:127;Sort by GPU;;
-18;testsuite-default-platform.at:147;Sort by GPU (rev);;
-19;testsuite-default-platform.at:167;Sort by CPU;;
-20;testsuite-default-platform.at:187;Sort by CPU (rev);;
-21;testsuite-default-platform.at:207;Sort by devices;;
-22;testsuite-default-platform.at:227;Sort by devices (rev);;
-23;testsuite-workaround.at:4;OCL_ICD_VENDORS as directory, two ICD;;
-24;testsuite-workaround.at:17;OCL_ICD_VENDORS as file, buggy ICD with workaround;;
-25;testsuite-workaround.at:27;OCL_ICD_VENDORS as file, buggy ICD without workaround;;
+5;testsuite-standard.at:37;OPENCL_VENDOR_PATH as directory;;
+6;testsuite-standard.at:47;invalid OPENCL_VENDOR_PATH (unknown path);;
+7;testsuite-standard.at:55;invalid OPENCL_VENDOR_PATH (.icd);;
+8;testsuite-standard.at:63;invalid OPENCL_VENDOR_PATH (library file);;
+9;testsuite-standard.at:71;OCL_ICD_VENDORS priority over OPENCL_VENDOR_PATH;;
+10;testsuite-standard.at:81;Our dummy ICD through our ICD loader;;
+11;testsuite-standard.at:92;ICD Loader extension;;
+12;testsuite-default-platform.at:3;No choice, among 0 => CL_INVALID_PLATFORM;;
+13;testsuite-default-platform.at:15;Choice 0, among 0 => CL_INVALID_PLATFORM;;
+14;testsuite-default-platform.at:26;Choice 1, among 0 => CL_INVALID_PLATFORM;;
+15;testsuite-default-platform.at:37;No choice, among 1 => default platform;;
+16;testsuite-default-platform.at:49;Choice 0, among 1 => default platform;;
+17;testsuite-default-platform.at:61;Choice 1, among 1 => CL_INVALID_PLATFORM;;
+18;testsuite-default-platform.at:73;No choice, among 2 => one platform;;
+19;testsuite-default-platform.at:90;Choice 0, among 2 => first platform;;
+20;testsuite-default-platform.at:101;Choice 1, among 2 => second platform;;
+21;testsuite-default-platform.at:112;Choice 2, among 2 => CL_INVALID_PLATFORM;;
+22;testsuite-default-platform.at:127;Sort by GPU;;
+23;testsuite-default-platform.at:147;Sort by GPU (rev);;
+24;testsuite-default-platform.at:167;Sort by CPU;;
+25;testsuite-default-platform.at:187;Sort by CPU (rev);;
+26;testsuite-default-platform.at:207;Sort by devices;;
+27;testsuite-default-platform.at:227;Sort by devices (rev);;
+28;testsuite-workaround.at:4;OCL_ICD_VENDORS as directory, two ICD;;
+29;testsuite-workaround.at:17;OCL_ICD_VENDORS as file, buggy ICD with workaround;;
+30;testsuite-workaround.at:27;OCL_ICD_VENDORS as file, buggy ICD without workaround;;
"
# List of the all the test groups.
at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -628,7 +633,7 @@ at_fn_validate_ranges ()
for at_grp
do
eval at_value=\$$at_grp
- if test $at_value -lt 1 || test $at_value -gt 25; then
+ if test $at_value -lt 1 || test $at_value -gt 30; then
$as_echo "invalid test group: $at_value" >&2
exit 1
fi
@@ -926,7 +931,7 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-OpenCL ICD Loader 2.2.8 test suite test groups:
+OpenCL ICD Loader 2.2.9 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -967,7 +972,7 @@ _ATEOF
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (OpenCL ICD Loader 2.2.8)" &&
+ $as_echo "$as_me (OpenCL ICD Loader 2.2.9)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -988,10 +993,10 @@ esac
# Category starts at test group 1.
at_banner_text_1="Standard compliant ocl-icd libOpenCL.so"
# Banner 2. testsuite-default-platform.at:1
-# Category starts at test group 7.
+# Category starts at test group 12.
at_banner_text_2="Default platform selection"
# Banner 3. testsuite-workaround.at:1
-# Category starts at test group 23.
+# Category starts at test group 28.
at_banner_text_3="ocl-icd with workaround for intel bug"
# Take any -C into account.
@@ -1153,11 +1158,11 @@ exec 5>>"$at_suite_log"
# Banners and logs.
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.8 test suite. ##
+## OpenCL ICD Loader 2.2.9 test suite. ##
## ----------------------------------- ##"
{
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.8 test suite. ##
+## OpenCL ICD Loader 2.2.9 test suite. ##
## ----------------------------------- ##"
echo
@@ -2001,7 +2006,7 @@ _ASBOX
$as_echo "Please send $at_msg and all information you think might help:
To: <ocl-icd-devel at lists.forge.imag.fr>
- Subject: [OpenCL ICD Loader 2.2.8] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+ Subject: [OpenCL ICD Loader 2.2.9] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
You may investigate any problem if you feel able to do so, in which
case the test suite provides a good starting point. Its output may
@@ -2263,20 +2268,361 @@ read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
at_fn_group_banner 5 'testsuite-standard.at:37' \
- "Our dummy ICD through our ICD loader" " " 1
+ "OPENCL_VENDOR_PATH as directory" " " 1
at_xfail=no
(
$as_echo "5. $at_setup_line: testing $at_desc ..."
$at_traceon
+ unset OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:38: unset OCL_ICD_VENDORS"
+
+
+
+
+ OCL_ICD_DEBUG=7
+ export OCL_ICD_DEBUG
+ $as_echo "$at_srcdir/testsuite-standard.at:39: export OCL_ICD_DEBUG=7"
+
+ OPENCL_VENDOR_PATH=$abs_top_builddir/vendors
+ export OPENCL_VENDOR_PATH
+ $as_echo "$at_srcdir/testsuite-standard.at:39: export OPENCL_VENDOR_PATH=\$abs_top_builddir/vendors"
+
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_DEBUG"'"'
+ $as_echo "environment: OCL_ICD_DEBUG='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OPENCL_VENDOR_PATH"'"'
+ $as_echo "environment: OPENCL_VENDOR_PATH='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite-standard.at:41: ocl_test | env LC_ALL=C sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:41"
+( $at_check_trace; ocl_test | env LC_ALL=C sort
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+echo >>"$at_stdout"; $as_echo "Found 2 platforms!
+ocl-icd ICD test
+ocl-icd ICD test2
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:41"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_5
+#AT_START_6
+at_fn_group_banner 6 'testsuite-standard.at:47' \
+ "invalid OPENCL_VENDOR_PATH (unknown path)" " " 1
+at_xfail=no
+(
+ $as_echo "6. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+ unset OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:48: unset OCL_ICD_VENDORS"
+
+
+
+
+ OCL_ICD_DEBUG=7
+ export OCL_ICD_DEBUG
+ $as_echo "$at_srcdir/testsuite-standard.at:49: export OCL_ICD_DEBUG=7"
+
+ OPENCL_VENDOR_PATH=unexisting-vendors-dir
+ export OPENCL_VENDOR_PATH
+ $as_echo "$at_srcdir/testsuite-standard.at:49: export OPENCL_VENDOR_PATH=unexisting-vendors-dir"
+
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_DEBUG"'"'
+ $as_echo "environment: OCL_ICD_DEBUG='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OPENCL_VENDOR_PATH"'"'
+ $as_echo "environment: OPENCL_VENDOR_PATH='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite-standard.at:51: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:51"
+( $at_check_trace; ocl_test
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+echo >>"$at_stdout"; $as_echo "No platforms found!
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:51"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_6
+#AT_START_7
+at_fn_group_banner 7 'testsuite-standard.at:55' \
+ "invalid OPENCL_VENDOR_PATH (.icd)" " " 1
+at_xfail=no
+(
+ $as_echo "7. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+ unset OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:56: unset OCL_ICD_VENDORS"
+
+
+
+
+ OCL_ICD_DEBUG=7
+ export OCL_ICD_DEBUG
+ $as_echo "$at_srcdir/testsuite-standard.at:57: export OCL_ICD_DEBUG=7"
+
+ OPENCL_VENDOR_PATH=$abs_top_builddir/vendors/dummycl.icd
+ export OPENCL_VENDOR_PATH
+ $as_echo "$at_srcdir/testsuite-standard.at:57: export OPENCL_VENDOR_PATH=\$abs_top_builddir/vendors/dummycl.icd"
+
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_DEBUG"'"'
+ $as_echo "environment: OCL_ICD_DEBUG='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OPENCL_VENDOR_PATH"'"'
+ $as_echo "environment: OPENCL_VENDOR_PATH='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite-standard.at:59: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:59"
+( $at_check_trace; ocl_test
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+echo >>"$at_stdout"; $as_echo "No platforms found!
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:59"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_7
+#AT_START_8
+at_fn_group_banner 8 'testsuite-standard.at:63' \
+ "invalid OPENCL_VENDOR_PATH (library file)" " " 1
+at_xfail=no
+(
+ $as_echo "8. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+ unset OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:64: unset OCL_ICD_VENDORS"
+
+
+
+
+ OCL_ICD_DEBUG=7
+ export OCL_ICD_DEBUG
+ $as_echo "$at_srcdir/testsuite-standard.at:65: export OCL_ICD_DEBUG=7"
+
+ OPENCL_VENDOR_PATH=$abs_top_builddir/.libs/libdummycl.so
+ export OPENCL_VENDOR_PATH
+ $as_echo "$at_srcdir/testsuite-standard.at:65: export OPENCL_VENDOR_PATH=\$abs_top_builddir/.libs/libdummycl.so"
+
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_DEBUG"'"'
+ $as_echo "environment: OCL_ICD_DEBUG='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OPENCL_VENDOR_PATH"'"'
+ $as_echo "environment: OPENCL_VENDOR_PATH='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite-standard.at:67: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:67"
+( $at_check_trace; ocl_test
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+echo >>"$at_stdout"; $as_echo "No platforms found!
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:67"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_8
+#AT_START_9
+at_fn_group_banner 9 'testsuite-standard.at:71' \
+ "OCL_ICD_VENDORS priority over OPENCL_VENDOR_PATH" "" 1
+at_xfail=no
+(
+ $as_echo "9. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
+ unset OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:72: unset OCL_ICD_VENDORS"
+
+
+
+
+ OCL_ICD_DEBUG=7
+ export OCL_ICD_DEBUG
+ $as_echo "$at_srcdir/testsuite-standard.at:73: export OCL_ICD_DEBUG=7"
+
+ OCL_ICD_VENDORS=$abs_top_builddir/vendors/dummycl.icd
+ export OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:73: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors/dummycl.icd"
+
+ OPENCL_VENDOR_PATH=$abs_top_builddir/vendors
+ export OPENCL_VENDOR_PATH
+ $as_echo "$at_srcdir/testsuite-standard.at:73: export OPENCL_VENDOR_PATH=\$abs_top_builddir/vendors"
+
+
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_DEBUG"'"'
+ $as_echo "environment: OCL_ICD_DEBUG='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_VENDORS"'"'
+ $as_echo "environment: OCL_ICD_VENDORS='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+ eval _at_envval='"$'"OPENCL_VENDOR_PATH"'"'
+ $as_echo "environment: OPENCL_VENDOR_PATH='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
+
+
+{ set +x
+$as_echo "$at_srcdir/testsuite-standard.at:76: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:76"
+( $at_check_trace; ocl_test
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; tee stderr <"$at_stderr"
+echo >>"$at_stdout"; $as_echo "Found 1 platforms!
+ocl-icd ICD test
+" | \
+ $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:76"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+ set +x
+ $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_9
+#AT_START_10
+at_fn_group_banner 10 'testsuite-standard.at:81' \
+ "Our dummy ICD through our ICD loader" " " 1
+at_xfail=no
+(
+ $as_echo "10. $at_setup_line: testing $at_desc ..."
+ $at_traceon
+
+
OCL_ICD_DEBUG=7
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:38: export OCL_ICD_DEBUG=7"
+ $as_echo "$at_srcdir/testsuite-standard.at:82: export OCL_ICD_DEBUG=7"
OCL_ICD_VENDORS=$abs_top_builddir/vendors
export OCL_ICD_VENDORS
- $as_echo "$at_srcdir/testsuite-standard.at:38: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
+ $as_echo "$at_srcdir/testsuite-standard.at:82: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
@@ -2301,34 +2647,34 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:40: run_dummy_icd_through_our_ICDL"
-at_fn_check_prepare_trace "testsuite-standard.at:40"
+$as_echo "$at_srcdir/testsuite-standard.at:84: run_dummy_icd_through_our_ICDL"
+at_fn_check_prepare_trace "testsuite-standard.at:84"
( $at_check_trace; run_dummy_icd_through_our_ICDL
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
echo stderr:; tee stderr <"$at_stderr"
echo stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:40"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:84"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:41: grep \"^-1\" stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:41"
+$as_echo "$at_srcdir/testsuite-standard.at:85: grep \"^-1\" stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:85"
( $at_check_trace; grep "^-1" stdout | sort
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:41"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:85"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:42: grep -v '^[0-9]* *:' stdout "
-at_fn_check_prepare_trace "testsuite-standard.at:42"
+$as_echo "$at_srcdir/testsuite-standard.at:86: grep -v '^[0-9]* *:' stdout "
+at_fn_check_prepare_trace "testsuite-standard.at:86"
( $at_check_trace; grep -v '^[0-9]* *:' stdout
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -2337,13 +2683,13 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo "---
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:42"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:86"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:44: sed -e \"s/ *(expected)//\" stdout | uniq -c | grep -v '^ *2 ' "
-at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:44"
+$as_echo "$at_srcdir/testsuite-standard.at:88: sed -e \"s/ *(expected)//\" stdout | uniq -c | grep -v '^ *2 ' "
+at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:88"
( $at_check_trace; sed -e "s/ *(expected)//" stdout | uniq -c | grep -v '^ *2 '
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
@@ -2352,7 +2698,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=:
echo >>"$at_stdout"; $as_echo " 1 ---
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:44"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:88"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2360,23 +2706,23 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_5
-#AT_START_6
-at_fn_group_banner 6 'testsuite-standard.at:48' \
+#AT_STOP_10
+#AT_START_11
+at_fn_group_banner 11 'testsuite-standard.at:92' \
"ICD Loader extension" " " 1
at_xfail=no
(
- $as_echo "6. $at_setup_line: testing $at_desc ..."
+ $as_echo "11. $at_setup_line: testing $at_desc ..."
$at_traceon
OCL_ICD_DEBUG=0
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:49: export OCL_ICD_DEBUG=0"
+ $as_echo "$at_srcdir/testsuite-standard.at:93: export OCL_ICD_DEBUG=0"
OCL_ICD_VENDORS=$abs_top_builddir/vendors
export OCL_ICD_VENDORS
- $as_echo "$at_srcdir/testsuite-standard.at:49: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
+ $as_echo "$at_srcdir/testsuite-standard.at:93: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
@@ -2401,20 +2747,20 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:51: ocl_test_icdl"
-at_fn_check_prepare_trace "testsuite-standard.at:51"
+$as_echo "$at_srcdir/testsuite-standard.at:95: ocl_test_icdl"
+at_fn_check_prepare_trace "testsuite-standard.at:95"
( $at_check_trace; ocl_test_icdl
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
-echo >>"$at_stdout"; $as_echo "ocl_version: OpenCL 1.2
-version: 2.2.8
+echo >>"$at_stdout"; $as_echo "ocl_version: OpenCL 2.1
+version: 2.2.9
name: OpenCL ICD Loader
vendor: OCL Icd free software
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:51"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:95"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2422,13 +2768,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_6
-#AT_START_7
-at_fn_group_banner 7 'testsuite-default-platform.at:3' \
+#AT_STOP_11
+#AT_START_12
+at_fn_group_banner 12 'testsuite-default-platform.at:3' \
"No choice, among 0 => CL_INVALID_PLATFORM" " " 2
at_xfail=no
(
- $as_echo "7. $at_setup_line: testing $at_desc ..."
+ $as_echo "12. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2501,13 +2847,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_7
-#AT_START_8
-at_fn_group_banner 8 'testsuite-default-platform.at:15' \
+#AT_STOP_12
+#AT_START_13
+at_fn_group_banner 13 'testsuite-default-platform.at:15' \
"Choice 0, among 0 => CL_INVALID_PLATFORM" " " 2
at_xfail=no
(
- $as_echo "8. $at_setup_line: testing $at_desc ..."
+ $as_echo "13. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2587,13 +2933,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_8
-#AT_START_9
-at_fn_group_banner 9 'testsuite-default-platform.at:26' \
+#AT_STOP_13
+#AT_START_14
+at_fn_group_banner 14 'testsuite-default-platform.at:26' \
"Choice 1, among 0 => CL_INVALID_PLATFORM" " " 2
at_xfail=no
(
- $as_echo "9. $at_setup_line: testing $at_desc ..."
+ $as_echo "14. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2673,13 +3019,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_9
-#AT_START_10
-at_fn_group_banner 10 'testsuite-default-platform.at:37' \
+#AT_STOP_14
+#AT_START_15
+at_fn_group_banner 15 'testsuite-default-platform.at:37' \
"No choice, among 1 => default platform" " " 2
at_xfail=no
(
- $as_echo "10. $at_setup_line: testing $at_desc ..."
+ $as_echo "15. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2753,13 +3099,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_10
-#AT_START_11
-at_fn_group_banner 11 'testsuite-default-platform.at:49' \
+#AT_STOP_15
+#AT_START_16
+at_fn_group_banner 16 'testsuite-default-platform.at:49' \
"Choice 0, among 1 => default platform" " " 2
at_xfail=no
(
- $as_echo "11. $at_setup_line: testing $at_desc ..."
+ $as_echo "16. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2840,13 +3186,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_11
-#AT_START_12
-at_fn_group_banner 12 'testsuite-default-platform.at:61' \
+#AT_STOP_16
+#AT_START_17
+at_fn_group_banner 17 'testsuite-default-platform.at:61' \
"Choice 1, among 1 => CL_INVALID_PLATFORM" " " 2
at_xfail=no
(
- $as_echo "12. $at_setup_line: testing $at_desc ..."
+ $as_echo "17. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -2927,13 +3273,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_12
-#AT_START_13
-at_fn_group_banner 13 'testsuite-default-platform.at:73' \
+#AT_STOP_17
+#AT_START_18
+at_fn_group_banner 18 'testsuite-default-platform.at:73' \
"No choice, among 2 => one platform" " " 2
at_xfail=no
(
- $as_echo "13. $at_setup_line: testing $at_desc ..."
+ $as_echo "18. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3028,13 +3374,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_13
-#AT_START_14
-at_fn_group_banner 14 'testsuite-default-platform.at:90' \
+#AT_STOP_18
+#AT_START_19
+at_fn_group_banner 19 'testsuite-default-platform.at:90' \
"Choice 0, among 2 => first platform" " " 2
at_xfail=no
(
- $as_echo "14. $at_setup_line: testing $at_desc ..."
+ $as_echo "19. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3130,13 +3476,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_14
-#AT_START_15
-at_fn_group_banner 15 'testsuite-default-platform.at:101' \
+#AT_STOP_19
+#AT_START_20
+at_fn_group_banner 20 'testsuite-default-platform.at:101' \
"Choice 1, among 2 => second platform" " " 2
at_xfail=no
(
- $as_echo "15. $at_setup_line: testing $at_desc ..."
+ $as_echo "20. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3232,13 +3578,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_15
-#AT_START_16
-at_fn_group_banner 16 'testsuite-default-platform.at:112' \
+#AT_STOP_20
+#AT_START_21
+at_fn_group_banner 21 'testsuite-default-platform.at:112' \
"Choice 2, among 2 => CL_INVALID_PLATFORM" " " 2
at_xfail=no
(
- $as_echo "16. $at_setup_line: testing $at_desc ..."
+ $as_echo "21. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3326,13 +3672,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_16
-#AT_START_17
-at_fn_group_banner 17 'testsuite-default-platform.at:127' \
+#AT_STOP_21
+#AT_START_22
+at_fn_group_banner 22 'testsuite-default-platform.at:127' \
"Sort by GPU" " " 2
at_xfail=no
(
- $as_echo "17. $at_setup_line: testing $at_desc ..."
+ $as_echo "22. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3480,13 +3826,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_17
-#AT_START_18
-at_fn_group_banner 18 'testsuite-default-platform.at:147' \
+#AT_STOP_22
+#AT_START_23
+at_fn_group_banner 23 'testsuite-default-platform.at:147' \
"Sort by GPU (rev)" " " 2
at_xfail=no
(
- $as_echo "18. $at_setup_line: testing $at_desc ..."
+ $as_echo "23. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3634,13 +3980,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_18
-#AT_START_19
-at_fn_group_banner 19 'testsuite-default-platform.at:167' \
+#AT_STOP_23
+#AT_START_24
+at_fn_group_banner 24 'testsuite-default-platform.at:167' \
"Sort by CPU" " " 2
at_xfail=no
(
- $as_echo "19. $at_setup_line: testing $at_desc ..."
+ $as_echo "24. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3788,13 +4134,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_19
-#AT_START_20
-at_fn_group_banner 20 'testsuite-default-platform.at:187' \
+#AT_STOP_24
+#AT_START_25
+at_fn_group_banner 25 'testsuite-default-platform.at:187' \
"Sort by CPU (rev)" " " 2
at_xfail=no
(
- $as_echo "20. $at_setup_line: testing $at_desc ..."
+ $as_echo "25. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -3942,13 +4288,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_20
-#AT_START_21
-at_fn_group_banner 21 'testsuite-default-platform.at:207' \
+#AT_STOP_25
+#AT_START_26
+at_fn_group_banner 26 'testsuite-default-platform.at:207' \
"Sort by devices" " " 2
at_xfail=no
(
- $as_echo "21. $at_setup_line: testing $at_desc ..."
+ $as_echo "26. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4096,13 +4442,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_21
-#AT_START_22
-at_fn_group_banner 22 'testsuite-default-platform.at:227' \
+#AT_STOP_26
+#AT_START_27
+at_fn_group_banner 27 'testsuite-default-platform.at:227' \
"Sort by devices (rev)" " " 2
at_xfail=no
(
- $as_echo "22. $at_setup_line: testing $at_desc ..."
+ $as_echo "27. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4250,13 +4596,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_22
-#AT_START_23
-at_fn_group_banner 23 'testsuite-workaround.at:4' \
+#AT_STOP_27
+#AT_START_28
+at_fn_group_banner 28 'testsuite-workaround.at:4' \
"OCL_ICD_VENDORS as directory, two ICD" " " 3
at_xfail=no
(
- $as_echo "23. $at_setup_line: testing $at_desc ..."
+ $as_echo "28. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4338,13 +4684,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_23
-#AT_START_24
-at_fn_group_banner 24 'testsuite-workaround.at:17' \
+#AT_STOP_28
+#AT_START_29
+at_fn_group_banner 29 'testsuite-workaround.at:17' \
"OCL_ICD_VENDORS as file, buggy ICD with workaround" "" 3
at_xfail=no
(
- $as_echo "24. $at_setup_line: testing $at_desc ..."
+ $as_echo "29. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4447,13 +4793,13 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_24
-#AT_START_25
-at_fn_group_banner 25 'testsuite-workaround.at:27' \
+#AT_STOP_29
+#AT_START_30
+at_fn_group_banner 30 'testsuite-workaround.at:27' \
"OCL_ICD_VENDORS as file, buggy ICD without workaround" "" 3
at_xfail=no
(
- $as_echo "25. $at_setup_line: testing $at_desc ..."
+ $as_echo "30. $at_setup_line: testing $at_desc ..."
$at_traceon
@@ -4517,4 +4863,4 @@ $at_traceon; }
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
-#AT_STOP_25
+#AT_STOP_30
diff --git a/tests/testsuite-standard.at b/tests/testsuite-standard.at
index 3c97f89..b5d66d3 100644
--- a/tests/testsuite-standard.at
+++ b/tests/testsuite-standard.at
@@ -34,6 +34,50 @@ ocl-icd ICD test
], [stderr])
AT_CLEANUP
+AT_SETUP([OPENCL_VENDOR_PATH as directory])
+AT_UNSET([OCL_ICD_VENDORS])
+AT_EXPORT([OCL_ICD_DEBUG],[7],
+ [OPENCL_VENDOR_PATH],[$abs_top_builddir/vendors])
+AT_CHECK([ocl_test | env LC_ALL=C sort], 0, [Found 2 platforms!
+ocl-icd ICD test
+ocl-icd ICD test2
+], [stderr])
+AT_CLEANUP
+
+AT_SETUP([invalid OPENCL_VENDOR_PATH (unknown path)])
+AT_UNSET([OCL_ICD_VENDORS])
+AT_EXPORT([OCL_ICD_DEBUG],[7],
+ [OPENCL_VENDOR_PATH],[unexisting-vendors-dir])
+AT_CHECK([ocl_test], 0, [No platforms found!
+], [stderr])
+AT_CLEANUP
+
+AT_SETUP([invalid OPENCL_VENDOR_PATH (.icd)])
+AT_UNSET([OCL_ICD_VENDORS])
+AT_EXPORT([OCL_ICD_DEBUG],[7],
+ [OPENCL_VENDOR_PATH],[$abs_top_builddir/vendors/dummycl.icd])
+AT_CHECK([ocl_test], 0, [No platforms found!
+], [stderr])
+AT_CLEANUP
+
+AT_SETUP([invalid OPENCL_VENDOR_PATH (library file)])
+AT_UNSET([OCL_ICD_VENDORS])
+AT_EXPORT([OCL_ICD_DEBUG],[7],
+ [OPENCL_VENDOR_PATH],[$abs_top_builddir/.libs/libdummycl.so])
+AT_CHECK([ocl_test], 0, [No platforms found!
+], [stderr])
+AT_CLEANUP
+
+AT_SETUP([OCL_ICD_VENDORS priority over OPENCL_VENDOR_PATH])
+AT_UNSET([OCL_ICD_VENDORS])
+AT_EXPORT([OCL_ICD_DEBUG],[7],
+ [OCL_ICD_VENDORS],[$abs_top_builddir/vendors/dummycl.icd],
+ [OPENCL_VENDOR_PATH],[$abs_top_builddir/vendors])
+AT_CHECK([ocl_test], 0, [Found 1 platforms!
+ocl-icd ICD test
+], [stderr])
+AT_CLEANUP
+
AT_SETUP([Our dummy ICD through our ICD loader])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors])
@@ -49,7 +93,7 @@ AT_SETUP([ICD Loader extension])
AT_EXPORT([OCL_ICD_DEBUG],[0],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors])
AT_CHECK([ocl_test_icdl], 0,
-[ocl_version: OpenCL 1.2
+[ocl_version: OpenCL AT_PACKAGE_OPENCL_VERSION
version: AT_PACKAGE_VERSION
name: OpenCL ICD Loader
vendor: OCL Icd free software
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ocl-icd.git
More information about the Pkg-opencl-commits
mailing list