Hello community, here is the log from the commit of package nvml for openSUSE:Factory checked in at 2017-07-07 10:17:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nvml (Old) and /work/SRC/openSUSE:Factory/.nvml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nvml" Fri Jul 7 10:17:54 2017 rev:8 rq:508638 version:1.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/nvml/nvml.changes 2017-04-17 10:25:29.341200908 +0200 +++ /work/SRC/openSUSE:Factory/.nvml.new/nvml.changes 2017-07-07 10:17:58.681999054 +0200 @@ -1,0 +2,6 @@ +Thu Jun 29 19:49:50 UTC 2017 - [email protected] + +- Update to new upstream release 1.2.3 + * pmempool: fix mapping type in pool_params_parse + +------------------------------------------------------------------- Old: ---- nvml-1.2.1.tar.gz New: ---- nvml-1.2.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nvml.spec ++++++ --- /var/tmp/diff_new_pack.JzJg3l/_old 2017-07-07 10:17:59.693855884 +0200 +++ /var/tmp/diff_new_pack.JzJg3l/_new 2017-07-07 10:17:59.697855318 +0200 @@ -18,7 +18,7 @@ Name: nvml -Version: 1.2.1 +Version: 1.2.3 Release: 1 Summary: Non-Volatile Memory Library License: BSD-3-Clause ++++++ nvml-1.2.1.tar.gz -> nvml-1.2.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/.travis.yml new/nvml-1.2.3/.travis.yml --- old/nvml-1.2.1/.travis.yml 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/.travis.yml 2017-05-19 08:57:18.000000000 +0200 @@ -18,4 +18,4 @@ - MAKE_PKG=1 CC=gcc OS=fedora OS_VER=23 EXPERIMENTAL=y after_success: - - if [[ $PUSH_THE_IMAGE -eq 1 ]]; then images/push-image.sh $OS:$OS_VER; fi + - if [[ $PUSH_THE_IMAGE -eq 1 ]]; then images/push-image.sh $OS-$OS_VER; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/ChangeLog new/nvml-1.2.3/ChangeLog --- old/nvml-1.2.1/ChangeLog 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/ChangeLog 2017-05-19 08:57:18.000000000 +0200 @@ -1,4 +1,25 @@ +Thu May 18 2017 Krzysztof Czurylo <[email protected]> + + * Version 1.2.3 + Bug fixes: + - test: extend timeout for selected tests + - test: reduce number of operations in obj_tx_mt + - test: define cfree() as free() in vmmalloc_calloc + + Other changes: + - common: move Docker images to new repo + +Sat Apr 15 2017 Krzysztof Czurylo <[email protected]> + + * Version 1.2.2 + Bug fixes: + - pmempool: fix mapping type in pool_params_parse + - test: limit number of arenas in vmem_stats + - test: do not run pool_lock test as root + - common: fix pkg-config files + - common: fix building packages for Debian + Tue Feb 21 2017 Krzysztof Czurylo <[email protected]> * Version 1.2.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/common/util.c new/nvml-1.2.3/src/common/util.c --- old/nvml-1.2.1/src/common/util.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/common/util.c 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016, Intel Corporation + * Copyright 2014-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,6 +39,8 @@ #include <string.h> #include <unistd.h> #include <endian.h> +#include <errno.h> +#include <time.h> #include "util.h" #include "valgrind_internal.h" @@ -268,3 +270,20 @@ return result; } + +/* + * util_localtime -- a wrapper for localtime function + * + * localtime can set nonzero errno even if it succeeds (e.g. when there is no + * /etc/localtime file under Linux) and we do not want the errno to be polluted + * in such cases. + */ +struct tm * +util_localtime(const time_t *timep) +{ + int oerrno = errno; + struct tm *tm = localtime(timep); + if (!tm) + errno = oerrno; + return tm; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/common/util.h new/nvml-1.2.3/src/common/util.h --- old/nvml-1.2.1/src/common/util.h 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/common/util.h 2017-05-19 08:57:18.000000000 +0200 @@ -47,6 +47,8 @@ #include <stdio.h> #include <ctype.h> +#include <sys/param.h> + extern unsigned long long Pagesize; extern unsigned long long Mmap_align; @@ -84,6 +86,7 @@ char *util_fgets(char *buffer, int max, FILE *stream); char *util_realpath(const char *path); int util_compare_file_inodes(const char *path1, const char *path2); +struct tm *util_localtime(const time_t *timep); #define UTIL_MAX_ERR_MSG 128 void util_strerror(int errnum, char *buff, size_t bufflen); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/libpmempool/check_util.c new/nvml-1.2.3/src/libpmempool/check_util.c --- old/nvml-1.2.1/src/libpmempool/check_util.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/libpmempool/check_util.c 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2016, Intel Corporation + * Copyright 2016-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -618,7 +618,7 @@ check_get_time_str(time_t time) { static char str_buff[STR_MAX] = {0, }; - struct tm *tm = localtime(&time); + struct tm *tm = util_localtime(&time); if (tm) strftime(str_buff, STR_MAX, TIME_STR_FMT, tm); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/libpmempool/pool.c new/nvml-1.2.3/src/libpmempool/pool.c --- old/nvml-1.2.1/src/libpmempool/pool.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/libpmempool/pool.c 2017-05-19 08:57:18.000000000 +0200 @@ -349,7 +349,7 @@ } params->size = (size_t)s; addr = mmap(NULL, (uint64_t)params->size, PROT_READ, - MAP_PRIVATE, fd, 0); + MAP_SHARED, fd, 0); if (addr == MAP_FAILED) { ret = -1; goto out_close; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/blk_pool_lock/TEST0 new/nvml-1.2.3/src/test/blk_pool_lock/TEST0 --- old/nvml-1.2.1/src/test/blk_pool_lock/TEST0 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/blk_pool_lock/TEST0 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -41,6 +41,7 @@ . ../unittest/unittest.sh require_test_type medium +require_no_superuser setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/blk_pool_lock/TEST0.PS1 new/nvml-1.2.3/src/test/blk_pool_lock/TEST0.PS1 --- old/nvml-1.2.1/src/test/blk_pool_lock/TEST0.PS1 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/blk_pool_lock/TEST0.PS1 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ . ..\unittest\unittest.ps1 require_test_type medium +require_no_superuser # doesn't make sense to run in local directory require_fs_type any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/blk_rw_mt/config.sh new/nvml-1.2.3/src/test/blk_rw_mt/config.sh --- old/nvml-1.2.1/src/test/blk_rw_mt/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/blk_rw_mt/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# blk_rw_mt/config.sh -- test configuration +# + +# Extend timeout for this test, as it may take a few minutes +# when run on a non-pmem file system. + +CONF_GLOBAL_TIMEOUT='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/libpmempool_backup/config.sh new/nvml-1.2.3/src/test/libpmempool_backup/config.sh --- old/nvml-1.2.1/src/test/libpmempool_backup/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/libpmempool_backup/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# libpmempool_backup/config.sh -- test configuration +# + +# Extend timeout for TEST0, as it may take more than a minute +# when run on a non-pmem file system. + +CONF_TIMEOUT[0]='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/log_pool_lock/TEST0 new/nvml-1.2.3/src/test/log_pool_lock/TEST0 --- old/nvml-1.2.1/src/test/log_pool_lock/TEST0 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/log_pool_lock/TEST0 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -41,6 +41,7 @@ . ../unittest/unittest.sh require_test_type medium +require_no_superuser setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/log_pool_lock/TEST0.PS1 new/nvml-1.2.3/src/test/log_pool_lock/TEST0.PS1 --- old/nvml-1.2.1/src/test/log_pool_lock/TEST0.PS1 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/log_pool_lock/TEST0.PS1 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ . ..\unittest\unittest.ps1 require_test_type medium +require_no_superuser # doesn't make sense to run in local directory require_fs_type any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_basic_integration/config.sh new/nvml-1.2.3/src/test/obj_basic_integration/config.sh --- old/nvml-1.2.1/src/test/obj_basic_integration/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_basic_integration/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# obj_basic_integration/config.sh -- test configuration +# + +# Extend timeout for this test, as it may take a few minutes +# when run on a non-pmem file system. + +CONF_GLOBAL_TIMEOUT='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_pool_lock/TEST0 new/nvml-1.2.3/src/test/obj_pool_lock/TEST0 --- old/nvml-1.2.1/src/test/obj_pool_lock/TEST0 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_pool_lock/TEST0 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -41,6 +41,7 @@ . ../unittest/unittest.sh require_test_type medium +require_no_superuser setup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_pool_lock/TEST0.PS1 new/nvml-1.2.3/src/test/obj_pool_lock/TEST0.PS1 --- old/nvml-1.2.1/src/test/obj_pool_lock/TEST0.PS1 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_pool_lock/TEST0.PS1 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 2015-2016, Intel Corporation +# Copyright 2015-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,6 +47,7 @@ . ..\unittest\unittest.ps1 require_test_type medium +require_no_superuser # doesn't make sense to run in local directory require_fs_type any diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_tx_add_range/config.sh new/nvml-1.2.3/src/test/obj_tx_add_range/config.sh --- old/nvml-1.2.1/src/test/obj_tx_add_range/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_tx_add_range/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# obj_tx_add_range/config.sh -- test configuration +# + +# Extend timeout for this test, as it may take a few minutes +# when run on a non-pmem file system. + +CONF_GLOBAL_TIMEOUT='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_tx_mt/config.sh new/nvml-1.2.3/src/test/obj_tx_mt/config.sh --- old/nvml-1.2.1/src/test/obj_tx_mt/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_tx_mt/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# obj_tx_mt/config.sh -- test configuration +# + +# Extend timeout for this test, as it may take a few minutes +# when run on a non-pmem file system. + +CONF_GLOBAL_TIMEOUT='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/obj_tx_mt/obj_tx_mt.c new/nvml-1.2.3/src/test/obj_tx_mt/obj_tx_mt.c --- old/nvml-1.2.1/src/test/obj_tx_mt/obj_tx_mt.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/obj_tx_mt/obj_tx_mt.c 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2016, Intel Corporation + * Copyright 2016-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,7 +39,8 @@ #include <pthread.h> #include "unittest.h" -#define LOOPS 100 +#define THREADS 8 +#define LOOPS 8 static PMEMobjpool *pop; static PMEMoid tab; @@ -62,7 +63,6 @@ if (locked) pthread_mutex_unlock(&mtx); } TX_END - locked = 0; TX_BEGIN(pop) { pthread_mutex_lock(&mtx); @@ -119,10 +119,9 @@ UT_FATAL("!pmemobj_create"); int i = 0; - long ncpus = sysconf(_SC_NPROCESSORS_ONLN); - pthread_t *threads = MALLOC(2 * ncpus * sizeof(threads[0])); + pthread_t *threads = MALLOC(THREADS * sizeof(threads[0])); - for (int j = 0; j < ncpus; ++j) { + for (int j = 0; j < THREADS / 2; ++j) { PTHREAD_CREATE(&threads[i++], NULL, tx_alloc_free, NULL); PTHREAD_CREATE(&threads[i++], NULL, tx_snap, NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/pmempool_check/TEST16.PS1 new/nvml-1.2.3/src/test/pmempool_check/TEST16.PS1 --- old/nvml-1.2.1/src/test/pmempool_check/TEST16.PS1 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/pmempool_check/TEST16.PS1 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -59,7 +59,7 @@ expect_normal_exit $PMEMPOOL create log $POOLSET -[int]$FUTURE_TIME=[int][double]::Parse((Get-Date -UFormat %s)) +[int]$FUTURE_TIME=[int64](([datetime]::UtcNow)-(Get-Date "1/1/1970")).TotalSeconds $FUTURE_TIME+=60*60 &$PMEMSPOIL -v $POOL_P1 "pool_hdr.crtime=$FUTURE_TIME" >> $LOG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/pmempool_check/config.sh new/nvml-1.2.3/src/test/pmempool_check/config.sh --- old/nvml-1.2.1/src/test/pmempool_check/config.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/nvml-1.2.3/src/test/pmempool_check/config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -0,0 +1,41 @@ +#!/bin/bash -e +# +# Copyright 2017, Intel Corporation +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# * Neither the name of the copyright holder nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# +# pmempool_check/config.sh -- test configuration +# + +# Extend timeout for TEST5, as it may take a few minutes +# when run on a non-pmem file system. + +CONF_TIMEOUT[5]='10m' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST0 new/nvml-1.2.3/src/test/vmem_stats/TEST0 --- old/nvml-1.2.1/src/test/vmem_stats/TEST0 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST0 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 0 grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST1 new/nvml-1.2.3/src/test/vmem_stats/TEST1 --- old/nvml-1.2.1/src/test/vmem_stats/TEST1 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST1 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 0 g grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST2 new/nvml-1.2.3/src/test/vmem_stats/TEST2 --- old/nvml-1.2.1/src/test/vmem_stats/TEST2 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST2 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 0 gbl grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST3 new/nvml-1.2.3/src/test/vmem_stats/TEST3 --- old/nvml-1.2.1/src/test/vmem_stats/TEST3 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST3 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 0 gbla grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST4 new/nvml-1.2.3/src/test/vmem_stats/TEST4 --- old/nvml-1.2.1/src/test/vmem_stats/TEST4 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST4 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 0 gblma grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST5 new/nvml-1.2.3/src/test/vmem_stats/TEST5 --- old/nvml-1.2.1/src/test/vmem_stats/TEST5 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST5 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 1 grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST6 new/nvml-1.2.3/src/test/vmem_stats/TEST6 --- old/nvml-1.2.1/src/test/vmem_stats/TEST6 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST6 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 1 g grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST7 new/nvml-1.2.3/src/test/vmem_stats/TEST7 --- old/nvml-1.2.1/src/test/vmem_stats/TEST7 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST7 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 1 gbl grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST8 new/nvml-1.2.3/src/test/vmem_stats/TEST8 --- old/nvml-1.2.1/src/test/vmem_stats/TEST8 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST8 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 1 gbla grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmem_stats/TEST9 new/nvml-1.2.3/src/test/vmem_stats/TEST9 --- old/nvml-1.2.1/src/test/vmem_stats/TEST9 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmem_stats/TEST9 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -50,6 +50,9 @@ setup +# limit the number of arenas to fit into the minimal VMEM pool size +export JE_VMEM_MALLOC_CONF="narenas:64" + expect_normal_exit ./vmem_stats$EXESUFFIX 1 gblma grep -v '<libvmem>:' vmem$UNITTEST_NUM.log > grep$UNITTEST_NUM.log diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmmalloc_calloc/TEST0 new/nvml-1.2.3/src/test/vmmalloc_calloc/TEST0 --- old/nvml-1.2.1/src/test/vmmalloc_calloc/TEST0 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmmalloc_calloc/TEST0 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2014-2016, Intel Corporation +# Copyright 2014-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -32,8 +32,7 @@ # # -# src/test/vmmalloc_calloc/TEST0 -- unit test for -# libvmmalloc calloc/cfree +# src/test/vmmalloc_calloc/TEST0 -- unit test for libvmmalloc calloc # export UNITTEST_NAME=vmmalloc_calloc/TEST0 export UNITTEST_NUM=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/test/vmmalloc_calloc/vmmalloc_calloc.c new/nvml-1.2.3/src/test/vmmalloc_calloc/vmmalloc_calloc.c --- old/nvml-1.2.1/src/test/vmmalloc_calloc/vmmalloc_calloc.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/test/vmmalloc_calloc/vmmalloc_calloc.c 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016, Intel Corporation + * Copyright 2014-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,7 +31,7 @@ */ /* - * vmmalloc_calloc.c -- unit test for libvmmalloc calloc/cfree + * vmmalloc_calloc.c -- unit test for libvmmalloc calloc * * usage: vmmalloc_calloc */ @@ -43,6 +43,11 @@ #define DEFAULT_COUNT (SMALL_MAXCLASS / 4) #define DEFAULT_N 100 +/* cfree() has been removed from glibc since version 2.26 */ +#ifndef cfree +#define cfree free +#endif + int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/src/tools/pmempool/output.c new/nvml-1.2.3/src/tools/pmempool/output.c --- old/nvml-1.2.1/src/tools/pmempool/output.c 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/src/tools/pmempool/output.c 2017-05-19 08:57:18.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016, Intel Corporation + * Copyright 2014-2017, Intel Corporation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -349,7 +349,7 @@ out_get_time_str(time_t time) { static char str_buff[STR_MAX] = {0, }; - struct tm *tm = localtime(&time); + struct tm *tm = util_localtime(&time); if (tm) strftime(str_buff, STR_MAX, TIME_STR_FMT, tm); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/build-dpkg.sh new/nvml-1.2.3/utils/build-dpkg.sh --- old/nvml-1.2.1/utils/build-dpkg.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/build-dpkg.sh 2017-05-19 08:57:18.000000000 +0200 @@ -139,6 +139,13 @@ Description: NVML librpmem library NVM Library for Remote Persistent Memory support +Package: librpmem-dev +Section: libdevel +Architecture: any +Depends: librpmem (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} +Description: Development files for librpmem + Development files for librpmem library. + Package: rpmemd Section: misc Architecture: any @@ -263,7 +270,7 @@ Architecture: any Depends: libpmemobj (=\${binary:Version}), \${shlibs:Depends}, \${misc:Depends} Description: Development files for libpmemobj - Development files for libpmemobj-dev library. + Development files for libpmemobj library. Package: libpmempool Architecture: any @@ -644,6 +651,7 @@ $INC_DIR/libpmemobj++/*.hpp $INC_DIR/libpmemobj++/detail/*.hpp $DOC_DIR/${OBJ_CPP_DOC_DIR}/* +$LIB_DIR/pkgconfig/libpmemobj++.pc EOF cat << EOF > debian/${OBJ_CPP_NAME}.triggers @@ -690,7 +698,7 @@ rm $CHANGELOG_TMP # This is our first release but we do -debuild -us -uc +debuild --preserve-envvar=EXTRA_CFLAGS --preserve-envvar=EXTRA_LDFLAGS -us -uc cd $OLD_DIR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/docker/build.sh new/nvml-1.2.3/utils/docker/build.sh --- old/nvml-1.2.1/utils/docker/build.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/docker/build.sh 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -47,7 +47,11 @@ exit 1 fi -imageName=nvml/${OS}:${OS_VER} +if [[ -z "$TEST_BUILD" ]]; then + TEST_BUILD=all +fi + +imageName=pmem/nvml:${OS}-${OS_VER} containerName=nvml-${OS}-${OS_VER} if [[ $CC == "clang" ]]; then export CXX="clang++"; else export CXX="g++"; fi @@ -82,6 +86,7 @@ --env TRAVIS_BRANCH=$TRAVIS_BRANCH \ --env TRAVIS_EVENT_TYPE=$TRAVIS_EVENT_TYPE \ -v $HOST_WORKDIR:$WORKDIR \ + -v /etc/localtime:/etc/localtime \ -w $SCRIPTSDIR \ $imageName $command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/docker/images/build-image.sh new/nvml-1.2.3/utils/docker/images/build-image.sh --- old/nvml-1.2.1/utils/docker/images/build-image.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/docker/images/build-image.sh 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,9 +31,9 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# build-image.sh <OS:VER> - prepares a Docker image with <OS>-based +# build-image.sh <OS-VER> - prepares a Docker image with <OS>-based # environment for building NVML project, according -# to the Dockerfile.<OS:VER> file located +# to the Dockerfile.<OS-VER> file located # in the same directory. # # The script can be run locally. @@ -41,8 +41,8 @@ function usage { echo "Usage:" - echo " build-image.sh <OS:VER>" - echo "where <OS:VER>, for example, can be 'ubuntu:16.04', provided " \ + echo " build-image.sh <OS-VER>" + echo "where <OS-VER>, for example, can be 'ubuntu-16.04', provided " \ "a Dockerfile named 'Dockerfile.ubuntu-16.04' exists in the " \ "current directory." } @@ -54,16 +54,15 @@ fi # Check if the file Dockerfile.OS-VER exists -os_ver=${1/\:/-} -if [[ ! -f "Dockerfile.$os_ver" ]]; then +if [[ ! -f "Dockerfile.$1" ]]; then echo "ERROR: wrong argument." usage exit 1 fi -# Build a Docker image tagged with nvml/OS:VER -tag=nvml/$1 +# Build a Docker image tagged with pmem/nvml:OS-VER +tag=pmem/nvml:$1 sudo docker build -t $tag \ --build-arg http_proxy=$http_proxy \ --build-arg https_proxy=$https_proxy \ - -f Dockerfile.$os_ver . + -f Dockerfile.$1 . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/docker/images/push-image.sh new/nvml-1.2.3/utils/docker/images/push-image.sh --- old/nvml-1.2.1/utils/docker/images/push-image.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/docker/images/push-image.sh 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash -e # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -31,19 +31,20 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# push-image.sh <OS:VER> - pushes the Docker image tagged with $OS:$OS_VER +# push-image.sh <OS-VER> - pushes the Docker image tagged with OS-VER # to the Docker Hub # -# The script utilizes $DOCKER_PASSWORD variable to log in to the Docker Hub. -# It can be set in the Travis project's configuration for automated builds. -# If it is not set, the user will be asked to provide the password. +# The script utilizes $DOCKER_USER and $DOCKER_PASSWORD variables to log in to +# Docker Hub. The variables can be set in the Travis project's configuration +# for automated builds. # function usage { echo "Usage:" - echo " push-image.sh <OS:VER>" - echo "where <OS:VER>, for example, can be 'ubuntu:16.04', provided " \ - "a Docker image tagged with nvml/ubuntu:16.04 exists locally." + echo " push-image.sh <OS-VER>" + echo "where <OS-VER>, for example, can be 'ubuntu-16.04', provided " \ + "a Docker image tagged with pmem/nvml:ubuntu-16.04 exists " \ + "locally." } # Check if the first argument is nonempty @@ -52,8 +53,8 @@ exit 1 fi -# Check if the image tagged with nvml/OS:VER exists locally -if [[ ! $(sudo docker images -a | awk -v pattern="^nvml/$1\$" \ +# Check if the image tagged with nvml/OS-VER exists locally +if [[ ! $(sudo docker images -a | awk -v pattern="^pmem/nvml:$1\$" \ '$1":"$2 ~ pattern') ]] then echo "ERROR: wrong argument." @@ -62,8 +63,8 @@ fi # Log in to the Docker Hub -sudo docker login -u="nvml" -p="$DOCKER_PASSWORD" +sudo docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD" # Push the image to the repository -sudo docker push nvml/$1 +sudo docker push pmem/nvml:$1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/docker/pull-or-rebuild-image.sh new/nvml-1.2.3/utils/docker/pull-or-rebuild-image.sh --- old/nvml-1.2.1/utils/docker/pull-or-rebuild-image.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/docker/pull-or-rebuild-image.sh 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/bash -e # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -44,7 +44,7 @@ # further scripts. # # If the Docker image does not have to be rebuilt, it will be pulled from -# the Docker Hub. +# Docker Hub. # if [[ -z "$OS" || -z "$OS_VER" ]]; then @@ -87,10 +87,10 @@ # Rebuild Docker image for the current OS version echo "Rebuilding the Docker image for the Dockerfile.$OS-$OS_VER" pushd $images_dir_name - ./build-image.sh $OS:$OS_VER + ./build-image.sh ${OS}-${OS_VER} popd - # Check if the image has to be pushed to the Docker Hub + # Check if the image has to be pushed to Docker Hub # (i.e. the build is triggered by commits to the pmem/nvml # repository's master branch, and the Travis build is not # of the "pull_request" type). In that case, create the empty @@ -99,16 +99,16 @@ && $TRAVIS_BRANCH == "master" \ && $TRAVIS_EVENT_TYPE != "pull_request" ]] then - echo "The image will be pushed to the Docker Hub" + echo "The image will be pushed to Docker Hub" touch push_image_to_repo_flag else - echo "Skip pushing the image to the Docker Hub" + echo "Skip pushing the image to Docker Hub" fi exit 0 fi done # Getting here means rebuilding the Docker image is not required. -# Pull the image from the Docker Hub. -sudo docker pull nvml/$OS:$OS_VER +# Pull the image from Docker Hub. +sudo docker pull pmem/nvml:${OS}-${OS_VER} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nvml-1.2.1/utils/make-pkg-config.sh new/nvml-1.2.3/utils/make-pkg-config.sh --- old/nvml-1.2.1/utils/make-pkg-config.sh 2017-03-02 17:17:52.000000000 +0100 +++ new/nvml-1.2.3/utils/make-pkg-config.sh 2017-05-19 08:57:18.000000000 +0200 @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright 2016, Intel Corporation +# Copyright 2016-2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -69,7 +69,7 @@ Description: libpmemobj library from NVML project Version: \${version} URL: http://pmem.io/nvml -Requires: libpmem +Requires.private: libpmem Libs: -L\${libdir} -lpmemobj Libs.private: -ldl Cflags: -I\${includedir} @@ -85,7 +85,7 @@ Description: libpmempool library from NVML project Version: \${version} URL: http://pmem.io/nvml -Requires: libpmem +Requires.private: libpmem Libs: -L\${libdir} -lpmempool Libs.private: -ldl Cflags: -I\${includedir} @@ -101,7 +101,7 @@ Description: libpmemblk library from NVML project Version: \${version} URL: http://pmem.io/nvml -Requires: libpmem +Requires.private: libpmem Libs: -L\${libdir} -lpmemblk Cflags: -I\${includedir} EOF @@ -116,7 +116,7 @@ Description: libpmemlog library from NVML project Version: \${version} URL: http://pmem.io/nvml -Requires: libpmem +Requires.private: libpmem Libs: -L\${libdir} -lpmemlog Cflags: -I\${includedir} EOF @@ -155,7 +155,7 @@ prefix=${prefix} libdir=${libdir} version=${version} -includedir=\${prefix}/include/libpmemobj +includedir=\${prefix}/include Name: libpmemobj++ Description: C++ bindings for the libpmemobj library from NVML project
