Skip to content

Commit

Permalink
common: fix env with comment
Browse files Browse the repository at this point in the history
Signed-off-by: Tomasz Gromadzki <[email protected]>
  • Loading branch information
grom72 committed Jan 24, 2024
1 parent 6a04bfb commit 3dca9c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/test/unittest/unittest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
env | grep "PMEM"
env | grep "PMEM" && echo "TEST_TG unittest.sh"
set -e

# make sure we have a well defined locale for string operations here
Expand Down Expand Up @@ -1870,7 +1870,7 @@ function setup() {
if [ "$REAL_FS" = "non-pmem" ]; then
export PMEMOBJ_CONF="${PMEMOBJ_CONF};sds.at_create=0"
fi
env | grep "PMEM"
env | grep "PMEM" && echo "TEST_TG setup"
}

#
Expand Down
14 changes: 8 additions & 6 deletions utils/docker/run-build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# run-build-package.sh - is called inside a Docker container; prepares
# the environment and starts a build of PMDK project.
#
env | grep "PMEM"
env | grep "PMEM" && echo "TEST_TG run-build-package.sh 0"
set -e

# Prepare build environment
Expand All @@ -21,14 +21,14 @@ echo "## Build package (and run basic tests)"
pushd $WORKDIR
export PCHECK_OPTS="-j2 BLACKLIST_FILE=${BLACKLIST_FILE}"
make -j$(nproc) $PACKAGE_MANAGER

env | grep "PMEM" && echo "TEST_TG run-build-package.sh 1"
echo "## Build PMDK once more (clobber from packaging process cleared out some required files)"
make -j$(nproc)

env | grep "PMEM" && echo "TEST_TG run-build-package.sh 2"
echo "## Test built packages"
[ "$NDCTL_ENABLE" == "n" ] && extra_params="--skip-daxio" || extra_params=""
python3 $SCRIPTSDIR/test_package/test-built-packages.py -r $(pwd) ${extra_params}

env | grep "PMEM" && echo "TEST_TG run-build-package.sh 3"
echo "## Install packages"
if [[ "$PACKAGE_MANAGER" == "dpkg" ]]; then
pushd $PACKAGE_MANAGER
Expand All @@ -39,14 +39,15 @@ else
echo $USERPASS | sudo -S rpm --install *.rpm
fi
popd

env | grep "PMEM" && echo "TEST_TG run-build-package.sh 4"
echo "## Test installed packages"
python3 $SCRIPTSDIR/test_package/test-packages-installation.py -r $(pwd)

echo "## Compile and run standalone test"
pushd $SCRIPTSDIR/test_package
make -j$(nproc) LIBPMEMOBJ_MIN_VERSION=1.4
./test_package testfile1
env | grep "PMEM" && echo "TEST_TG run-build-package.sh 5"

echo "## Use pmreorder installed in the system"
pmreorder_version="$(pmreorder -v)"
Expand All @@ -62,6 +63,7 @@ echo "## Run tests (against PMDK installed in the system)"
pushd $WORKDIR/src/test
make -j$(nproc) clobber
make -j$(nproc)
env | grep "PMEM" && echo "TEST_TG run-build-package.sh 7"

# Append variables with path to PMDK set in the OS (rather than in the git tree)
# - for testing packages installed in the system.
Expand All @@ -81,7 +83,7 @@ PMDK_LIB_PATH_NONDEBUG=$PMDK_LIB_PATH_NONDEBUG
PMDK_LIB_PATH_DEBUG=$PMDK_LIB_PATH_NONDEBUG/$DEBUG_DIR
EOF

env | grep "PMEM"
env | grep "PMEM" && echo "TEST_TG"
./RUNTESTS.sh -t check
# XXX The Python-based test framework is not able yet to run tests against
# binaries installed in the system. https://github.com/pmem/pmdk/issues/5839
Expand Down

0 comments on commit 3dca9c2

Please sign in to comment.