[ocl-icd] 07/09: Imported Upstream version 2.2.4
Vincent Danjean
vdanjean at debian.org
Mon May 18 19:36:32 UTC 2015
This is an automated email from the git hooks/post-receive script.
vdanjean pushed a commit to branch master
in repository ocl-icd.
commit a824e7a907c01ad0977a14c7c5c1703f6db884ee
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date: Mon May 18 21:13:18 2015 +0200
Imported Upstream version 2.2.4
---
NEWS | 13 ++++
aclocal.m4 | 7 +-
configure | 24 +++----
configure.ac | 2 +-
icd_generator.rb | 1 +
ocl_icd_loader.c | 11 ++-
tests/package.m4 | 4 +-
tests/testsuite | 160 +++++++++++++++++---------------------------
tests/testsuite-standard.at | 25 +++----
9 files changed, 112 insertions(+), 135 deletions(-)
diff --git a/NEWS b/NEWS
index c4d9163..a74c412 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
+Version 2.2.4
+=============
+
+Brice Videau (1):
+ Consistency.
+
+Vincent Danjean (4):
+ Avoid using system-wide vendors files at test time
+ avoid loading ICD at library init time
+ Improve tests
+ Fix initialization in case of default platform use
+ Release 2.2.4
+
Version 2.2.3
=============
diff --git a/aclocal.m4 b/aclocal.m4
index 3b7e029..a4773d9 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -163,10 +163,9 @@ AC_SUBST([AR])dnl
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
diff --git a/configure b/configure
index 674c4d8..5e7525b 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.3.
+# Generated by GNU Autoconf 2.69 for OpenCL ICD Loader 2.2.4.
#
# 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.3'
-PACKAGE_STRING='OpenCL ICD Loader 2.2.3'
+PACKAGE_VERSION='2.2.4'
+PACKAGE_STRING='OpenCL ICD Loader 2.2.4'
PACKAGE_BUGREPORT='ocl-icd-devel at lists.forge.imag.fr'
PACKAGE_URL=''
@@ -1330,7 +1330,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.3 to adapt to many kinds of systems.
+\`configure' configures OpenCL ICD Loader 2.2.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1400,7 +1400,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.3:";;
+ short | recursive ) echo "Configuration of OpenCL ICD Loader 2.2.4:";;
esac
cat <<\_ACEOF
@@ -1517,7 +1517,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-OpenCL ICD Loader configure 2.2.3
+OpenCL ICD Loader configure 2.2.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1940,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.3, which was
+It was created by OpenCL ICD Loader $as_me 2.2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2493,8 +2493,8 @@ test "$program_suffix" != NONE &&
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2807,7 +2807,7 @@ fi
# Define the identity of the package.
PACKAGE='ocl-icd'
- VERSION='2.2.3'
+ VERSION='2.2.4'
cat >>confdefs.h <<_ACEOF
@@ -13553,7 +13553,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.3, which was
+This file was extended by OpenCL ICD Loader $as_me 2.2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13619,7 +13619,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.3
+OpenCL ICD Loader config.status 2.2.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index da655d2..a957044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.67])
-AC_INIT([OpenCL ICD Loader], [2.2.3], [ocl-icd-devel at lists.forge.imag.fr], [ocl-icd])
+AC_INIT([OpenCL ICD Loader], [2.2.4], [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])
diff --git a/icd_generator.rb b/icd_generator.rb
index 687ce3e..4fb4a05 100644
--- a/icd_generator.rb
+++ b/icd_generator.rb
@@ -223,6 +223,7 @@ EOF
run_dummy_icd += "# pragma GCC diagnostic ignored \"-Wcpp\"\n"
run_dummy_icd += "# define CL_USE_DEPRECATED_OPENCL_1_0_APIS\n"
run_dummy_icd += "# define CL_USE_DEPRECATED_OPENCL_1_1_APIS\n"
+ run_dummy_icd += "# define CL_USE_DEPRECATED_OPENCL_1_2_APIS\n"
run_dummy_icd += "# include <CL/opencl.h>\n"
run_dummy_icd += self.include_headers
run_dummy_icd += "#pragma GCC diagnostic pop\n"
diff --git a/ocl_icd_loader.c b/ocl_icd_loader.c
index b5affe2..2bb7605 100644
--- a/ocl_icd_loader.c
+++ b/ocl_icd_loader.c
@@ -544,9 +544,7 @@ static int gard=0;
volatile static __thread int in_init = 0;
volatile static cl_uint _initialized = 0;
-static inline void __attribute__((constructor)) _initClIcd( void ) {
- if( _initialized )
- return;
+static void _initClIcd_real( void ) {
#ifdef USE_PTHREAD
if (in_init) {
/* probably reentrency, in_init is a __thread variable */
@@ -581,10 +579,17 @@ static inline void __attribute__((constructor)) _initClIcd( void ) {
_initialized = 1;
}
+static inline void _initClIcd( void ) {
+ if( __builtin_expect (_initialized, 1) )
+ return;
+ _initClIcd_real();
+}
+
cl_platform_id __attribute__((visibility("internal")))
getDefaultPlatformID() {
static cl_platform_id defaultPlatformID=NULL;
static int defaultSet=0;
+ _initClIcd();
if (! defaultSet) {
do {
if(_num_picds == 0) {
diff --git a/tests/package.m4 b/tests/package.m4
index e0a0f69..ca57648 100644
--- a/tests/package.m4
+++ b/tests/package.m4
@@ -4,9 +4,9 @@ m4_define([AT_PACKAGE_NAME],
m4_define([AT_PACKAGE_TARNAME],
[ocl-icd])
m4_define([AT_PACKAGE_VERSION],
- [2.2.3])
+ [2.2.4])
m4_define([AT_PACKAGE_STRING],
- [OpenCL ICD Loader 2.2.3])
+ [OpenCL ICD Loader 2.2.4])
m4_define([AT_PACKAGE_BUGREPORT],
[ocl-icd-devel at lists.forge.imag.fr])
m4_define([AT_PACKAGE_URL],
diff --git a/tests/testsuite b/tests/testsuite
index 08409e9..b69aa46 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -591,11 +591,11 @@ at_tested=''
at_format='??'
# Description of all the test groups.
at_help_all="1;testsuite-standard.at:3;invalid OCL_ICD_VENDORS;;
-2;testsuite-standard.at:12;OCL_ICD_VENDORS as directory;;
-3;testsuite-standard.at:25;OCL_ICD_VENDORS as library file;;
-4;testsuite-standard.at:35;OCL_ICD_VENDORS as ICD file (.icd);;
-5;testsuite-standard.at:45;Our dummy ICD through our ICD loader;;
-6;testsuite-standard.at:52;ICD Loader extension;;
+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:44;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;;
@@ -920,7 +920,7 @@ fi
# List of tests.
if $at_list_p; then
cat <<_ATEOF || at_write_fail=1
-OpenCL ICD Loader 2.2.3 test suite test groups:
+OpenCL ICD Loader 2.2.4 test suite test groups:
NUM: FILE-NAME:LINE TEST-GROUP-NAME
KEYWORDS
@@ -961,7 +961,7 @@ _ATEOF
exit $at_write_fail
fi
if $at_version_p; then
- $as_echo "$as_me (OpenCL ICD Loader 2.2.3)" &&
+ $as_echo "$as_me (OpenCL ICD Loader 2.2.4)" &&
cat <<\_ATEOF || at_write_fail=1
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1147,11 +1147,11 @@ exec 5>>"$at_suite_log"
# Banners and logs.
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.3 test suite. ##
+## OpenCL ICD Loader 2.2.4 test suite. ##
## ----------------------------------- ##"
{
$as_echo "## ----------------------------------- ##
-## OpenCL ICD Loader 2.2.3 test suite. ##
+## OpenCL ICD Loader 2.2.4 test suite. ##
## ----------------------------------- ##"
echo
@@ -1995,7 +1995,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.3] $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.4] $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
@@ -2056,23 +2056,10 @@ at_fn_check_prepare_trace "testsuite-standard.at:6"
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:6"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:7: cat stdout"
-at_fn_check_prepare_trace "testsuite-standard.at:7"
-( $at_check_trace; cat stdout
-) >>"$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 "No platforms found!
" | \
$at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:7"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:6"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2082,7 +2069,7 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_1
#AT_START_2
-at_fn_group_banner 2 'testsuite-standard.at:12' \
+at_fn_group_banner 2 'testsuite-standard.at:10' \
"OCL_ICD_VENDORS as directory" " " 1
at_xfail=no
(
@@ -2091,18 +2078,18 @@ at_xfail=no
unset OCL_ICD_ASSUME_ICD_EXTENSION
- $as_echo "$at_srcdir/testsuite-standard.at:13: unset OCL_ICD_ASSUME_ICD_EXTENSION"
+ $as_echo "$at_srcdir/testsuite-standard.at:11: unset OCL_ICD_ASSUME_ICD_EXTENSION"
OCL_ICD_DEBUG=7
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:14: export OCL_ICD_DEBUG=7"
+ $as_echo "$at_srcdir/testsuite-standard.at:12: export OCL_ICD_DEBUG=7"
OCL_ICD_VENDORS=$abs_top_builddir/vendors
export OCL_ICD_VENDORS
- $as_echo "$at_srcdir/testsuite-standard.at:14: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
+ $as_echo "$at_srcdir/testsuite-standard.at:12: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
@@ -2127,32 +2114,19 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:16: ocl_test"
-at_fn_check_prepare_trace "testsuite-standard.at:16"
-( $at_check_trace; ocl_test
+$as_echo "$at_srcdir/testsuite-standard.at:15: ocl_test | env LC_ALL=C sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:15"
+( $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 stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:16"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:18: env LC_ALL=C sort stdout"
-at_fn_check_prepare_trace "testsuite-standard.at:18"
-( $at_check_trace; env LC_ALL=C sort stdout
-) >>"$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 "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:18"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:15"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2162,7 +2136,7 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_2
#AT_START_3
-at_fn_group_banner 3 'testsuite-standard.at:25' \
+at_fn_group_banner 3 'testsuite-standard.at:21' \
"OCL_ICD_VENDORS as library file" " " 1
at_xfail=no
(
@@ -2172,11 +2146,11 @@ at_xfail=no
OCL_ICD_DEBUG=7
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:26: export OCL_ICD_DEBUG=7"
+ $as_echo "$at_srcdir/testsuite-standard.at:22: export OCL_ICD_DEBUG=7"
OCL_ICD_VENDORS=$abs_top_builddir/.libs/libdummycl.so
export OCL_ICD_VENDORS
- $as_echo "$at_srcdir/testsuite-standard.at:26: export OCL_ICD_VENDORS=\$abs_top_builddir/.libs/libdummycl.so"
+ $as_echo "$at_srcdir/testsuite-standard.at:22: export OCL_ICD_VENDORS=\$abs_top_builddir/.libs/libdummycl.so"
@@ -2201,31 +2175,18 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:28: ocl_test"
-at_fn_check_prepare_trace "testsuite-standard.at:28"
+$as_echo "$at_srcdir/testsuite-standard.at:24: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:24"
( $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 stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:28"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:29: cat stdout"
-at_fn_check_prepare_trace "testsuite-standard.at:29"
-( $at_check_trace; cat stdout
-) >>"$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 "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:29"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:24"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2235,7 +2196,7 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_3
#AT_START_4
-at_fn_group_banner 4 'testsuite-standard.at:35' \
+at_fn_group_banner 4 'testsuite-standard.at:29' \
"OCL_ICD_VENDORS as ICD file (.icd)" " " 1
at_xfail=no
(
@@ -2245,11 +2206,11 @@ at_xfail=no
OCL_ICD_DEBUG=7
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:36: export OCL_ICD_DEBUG=7"
+ $as_echo "$at_srcdir/testsuite-standard.at:30: 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:36: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors/dummycl.icd"
+ $as_echo "$at_srcdir/testsuite-standard.at:30: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors/dummycl.icd"
@@ -2274,31 +2235,18 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:38: ocl_test"
-at_fn_check_prepare_trace "testsuite-standard.at:38"
+$as_echo "$at_srcdir/testsuite-standard.at:32: ocl_test"
+at_fn_check_prepare_trace "testsuite-standard.at:32"
( $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 stdout:; tee stdout <"$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:38"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:39: cat stdout"
-at_fn_check_prepare_trace "testsuite-standard.at:39"
-( $at_check_trace; cat stdout
-) >>"$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 "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:39"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:32"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2308,7 +2256,7 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_4
#AT_START_5
-at_fn_group_banner 5 'testsuite-standard.at:45' \
+at_fn_group_banner 5 'testsuite-standard.at:37' \
"Our dummy ICD through our ICD loader" " " 1
at_xfail=no
(
@@ -2318,11 +2266,11 @@ at_xfail=no
OCL_ICD_DEBUG=15
export OCL_ICD_DEBUG
- $as_echo "$at_srcdir/testsuite-standard.at:46: export OCL_ICD_DEBUG=15"
+ $as_echo "$at_srcdir/testsuite-standard.at:38: export OCL_ICD_DEBUG=15"
OCL_ICD_VENDORS=$abs_top_builddir/vendors
export OCL_ICD_VENDORS
- $as_echo "$at_srcdir/testsuite-standard.at:46: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
+ $as_echo "$at_srcdir/testsuite-standard.at:38: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
@@ -2347,28 +2295,28 @@ at_xfail=no
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:48: run_dummy_icd_through_our_ICDL"
-at_fn_check_prepare_trace "testsuite-standard.at:48"
+$as_echo "$at_srcdir/testsuite-standard.at:40: run_dummy_icd_through_our_ICDL"
+at_fn_check_prepare_trace "testsuite-standard.at:40"
( $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:48"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:40"
$at_failed && at_fn_log_failure
$at_traceon; }
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:49: grep \"^-1\" stdout | sort"
-at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:49"
+$as_echo "$at_srcdir/testsuite-standard.at:41: grep \"^-1\" stdout | sort"
+at_fn_check_prepare_notrace 'a shell pipeline' "testsuite-standard.at:41"
( $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:49"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:41"
$at_failed && at_fn_log_failure
$at_traceon; }
@@ -2378,28 +2326,46 @@ $at_traceon; }
read at_status <"$at_status_file"
#AT_STOP_5
#AT_START_6
-at_fn_group_banner 6 'testsuite-standard.at:52' \
+at_fn_group_banner 6 'testsuite-standard.at:44' \
"ICD Loader extension" " " 1
at_xfail=no
(
$as_echo "6. $at_setup_line: testing $at_desc ..."
$at_traceon
+
+ OCL_ICD_VENDORS=$abs_top_builddir/vendors
+ export OCL_ICD_VENDORS
+ $as_echo "$at_srcdir/testsuite-standard.at:45: export OCL_ICD_VENDORS=\$abs_top_builddir/vendors"
+
+
+
+
+
+ eval _at_envval='"$'"OCL_ICD_VENDORS"'"'
+ $as_echo "environment: OCL_ICD_VENDORS='$($as_echo "$_at_envval" | sed "s/'/'\\\\''/g")'"
+
+
+
+
+
+
+
{ set +x
-$as_echo "$at_srcdir/testsuite-standard.at:53: ocl_test_icdl"
-at_fn_check_prepare_trace "testsuite-standard.at:53"
+$as_echo "$at_srcdir/testsuite-standard.at:46: ocl_test_icdl"
+at_fn_check_prepare_trace "testsuite-standard.at:46"
( $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.3
+version: 2.2.4
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:53"
+at_fn_check_status 0 $at_status "$at_srcdir/testsuite-standard.at:46"
$at_failed && at_fn_log_failure
$at_traceon; }
diff --git a/tests/testsuite-standard.at b/tests/testsuite-standard.at
index 96be1e6..cf515ad 100644
--- a/tests/testsuite-standard.at
+++ b/tests/testsuite-standard.at
@@ -3,43 +3,35 @@ AT_BANNER([Standard compliant ocl-icd libOpenCL.so])
AT_SETUP([invalid OCL_ICD_VENDORS])
AT_EXPORT([OCL_ICD_DEBUG],[15],
[OCL_ICD_VENDORS],[unexisting-vendors-dir])
-AT_CHECK([ocl_test], 0, [stdout], [stderr])
-AT_CHECK([cat stdout], 0,
-[No platforms found!
-])
+AT_CHECK([ocl_test], 0, [No platforms found!
+], [stderr])
AT_CLEANUP
AT_SETUP([OCL_ICD_VENDORS as directory])
AT_UNSET([OCL_ICD_ASSUME_ICD_EXTENSION])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors])
-AT_CHECK([ocl_test], 0, [stdout], [stderr])
dnl platforms can be listed in any order
-AT_CHECK([env LC_ALL=C sort stdout], 0,
-[Found 2 platforms!
+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([OCL_ICD_VENDORS as library file])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/.libs/libdummycl.so])
-AT_CHECK([ocl_test], 0, [stdout], [stderr])
-AT_CHECK([cat stdout], 0,
-[Found 1 platforms!
+AT_CHECK([ocl_test], 0, [Found 1 platforms!
ocl-icd ICD test
-])
+], [stderr])
AT_CLEANUP
AT_SETUP([OCL_ICD_VENDORS as ICD file (.icd)])
AT_EXPORT([OCL_ICD_DEBUG],[7],
[OCL_ICD_VENDORS],[$abs_top_builddir/vendors/dummycl.icd])
-AT_CHECK([ocl_test], 0, [stdout], [stderr])
-AT_CHECK([cat stdout], 0,
-[Found 1 platforms!
+AT_CHECK([ocl_test], 0, [Found 1 platforms!
ocl-icd ICD test
-])
+], [stderr])
AT_CLEANUP
AT_SETUP([Our dummy ICD through our ICD loader])
@@ -50,6 +42,7 @@ AT_CHECK([grep "^-1" stdout | sort], 0, [])
AT_CLEANUP
AT_SETUP([ICD Loader extension])
+AT_EXPORT([OCL_ICD_VENDORS],[$abs_top_builddir/vendors])
AT_CHECK([ocl_test_icdl], 0,
[ocl_version: OpenCL 1.2
version: AT_PACKAGE_VERSION
--
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