Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
dCache
cta
Commits
2993aba4
Commit
2993aba4
authored
Sep 24, 2019
by
Steven Murray
Browse files
Added disabled/commented out valgrind test of /usr/bin/cta-rdbmsUnitTests for Oracle
parent
bb5e27eb
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
continuousintegration/docker/ctafrontend/cc7/opt/run/bin/oracleunittests.sh
View file @
2993aba4
#!/bin/bash
# The CERN Tape Archive (CTA) project
# Copyright (C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set
-e
.
/opt/run/bin/init_pod.sh
...
...
@@ -21,7 +37,10 @@ echo ${DATABASEURL} > /etc/cta/cta-catalogue.conf
yum
-y
install
cta-catalogueutils cta-systemtests
/usr/bin/cta-rdbmsUnitTests /etc/cta/cta-catalogue.conf
2>&1 /usr/bin/cta-rdbmsUnitTests /etc/cta/cta-catalogue.conf |
awk
'{print "oracle " $0;}'
# Disabled/commented out the valgrind tests of Oracle until they work better with CI
#2>&1 /usr/bin/cta-rdbmsUnitTests-oracle.sh /etc/cta/cta-catalogue.conf | awk '{print "valgrind oracle " $0;}'
echo
'yes'
| /usr/bin/cta-catalogue-schema-drop /etc/cta/cta-catalogue.conf
/usr/bin/cta-catalogue-schema-create /etc/cta/cta-catalogue.conf
cta.spec.in
View file @
2993aba4
...
...
@@ -227,6 +227,7 @@ Unit tests and system tests with virtual tape drives
%{_libdir}/libsystemTestHelperTests.so*
%{_libdir}/libcta-tapedSystemTests.so*
%{_bindir}/cta-rdbmsUnitTests
%{_bindir}/cta-rdbmsUnitTests-oracle.sh
%{_bindir}/cta-unitTests
%{_bindir}/cta-unitTests-multiProcess
%{_bindir}/cta-valgrindUnitTests.sh
...
...
tests/CMakeLists.txt
View file @
2993aba4
...
...
@@ -117,9 +117,10 @@ install(TARGETS cta-rdbmsUnitTests cta-unitTests cta-unitTests-multiProcess cta-
install
(
TARGETS systemTestHelperTests DESTINATION usr/
${
CMAKE_INSTALL_LIBDIR
}
)
configure_file
(
cta-rdbmsUnitTests-oracle.sh.in
${
CMAKE_CURRENT_BINARY_DIR
}
/cta-rdbmsUnitTests-oracle.sh @ONLY
)
configure_file
(
cta-valgrindUnitTests.sh.in
${
CMAKE_CURRENT_BINARY_DIR
}
/cta-valgrindUnitTests.sh
)
configure_file
(
parallelTestsMakefile.in
${
CMAKE_CURRENT_BINARY_DIR
}
/parallelTestsMakefile @ONLY
)
configure_file
(
parallelTestsMakefile.local.in
${
CMAKE_CURRENT_BINARY_DIR
}
/parallelTestsMakefile.local @ONLY
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/cta-valgrindUnitTests.sh cta-unitPlusSystemTests.sh DESTINATION usr/bin
)
install
(
FILES valgrind.suppr helgrind.suppr
${
CMAKE_CURRENT_BINARY_DIR
}
/parallelTestsMakefile DESTINATION usr/share/cta-
${
CTA_VERSION
}
/unittest/
)
install
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/cta-rdbmsUnitTests-oracle.sh
${
CMAKE_CURRENT_BINARY_DIR
}
/cta-valgrindUnitTests.sh cta-unitPlusSystemTests.sh DESTINATION usr/bin
)
install
(
FILES
cta-rdbmsUnitTests-oracle.suppr
valgrind.suppr helgrind.suppr
${
CMAKE_CURRENT_BINARY_DIR
}
/parallelTestsMakefile DESTINATION usr/share/cta-
${
CTA_VERSION
}
/unittest/
)
tests/cta-rdbmsUnitTests-oracle.sh.in
0 → 100755
View file @
2993aba4
#!/bin/bash
# The CERN Tape Archive (CTA) project
# Copyright (C) 2015 CERN
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
set
-e
if
test
$#
-ne
1
;
then
echo
"Wrong number of command-line arguments: expected=1 actual=$#"
echo
"Usage: cta-rdbmsUnitTests-oracle.sh databaseConnectionFile"
exit
1
fi
DB_CONN_FILE
=
$1
valgrind
--gen-suppressions
=
all
--suppressions
=
/usr/share/cta-@CTA_VERSION@/unittest/cta-rdbmsUnitTests-oracle.suppr /usr/bin/cta-rdbmsUnitTests
${
DB_CONN_FILE
}
tests/cta-rdbmsUnitTests-oracle.suppr
0 → 100644
View file @
2993aba4
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment