Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
4d637628
Commit
4d637628
authored
Jun 29, 2018
by
Teodor Mircea Ionita
Committed by
Vicențiu-Marian Ciorbaru
Jun 29, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-16213: Travis whitespace fix and remove comment
parent
7b6e8672
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
.travis.compiler.sh
.travis.compiler.sh
+2
-2
.travis.yml
.travis.yml
+0
-2
No files found.
.travis.compiler.sh
View file @
4d637628
...
@@ -10,10 +10,10 @@ function exclude_modules() {
...
@@ -10,10 +10,10 @@ function exclude_modules() {
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO"
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO"
# exclude storage engines not being tested in current job
# exclude storage engines not being tested in current job
if
[[
!
"
${
MYSQL_TEST_SUITES
}
"
=
~
"archive"
]]
;
then
if
[[
!
"
${
MYSQL_TEST_SUITES
}
"
=
~
"archive"
]]
;
then
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_ARCHIVE=NO"
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_ARCHIVE=NO"
fi
fi
if
[[
!
"
${
MYSQL_TEST_SUITES
}
"
=
~
"rocksdb"
]]
;
then
if
[[
!
"
${
MYSQL_TEST_SUITES
}
"
=
~
"rocksdb"
]]
;
then
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_ROCKSDB=NO"
CMAKE_OPT
=
"
${
CMAKE_OPT
}
-DPLUGIN_ROCKSDB=NO"
fi
fi
}
}
...
...
.travis.yml
View file @
4d637628
...
@@ -177,8 +177,6 @@ script:
...
@@ -177,8 +177,6 @@ script:
-DWITH_SSL=system -DWITH_ZLIB=system
-DWITH_SSL=system -DWITH_ZLIB=system
-
make -j
4
-
make -j
4
-
cd mysql-test
-
cd mysql-test
# With ASAN use --thread-stack=400K to account for overhead
# Test timeout needs to be 10 (minutes) or less due to travis job timeout
-
travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT}
-
travis_wait 30 ./mtr --force --max-test-fail=20 --parallel=4 --testcase-timeout=${TEST_CASE_TIMEOUT}
--suite=${MYSQL_TEST_SUITES}
--suite=${MYSQL_TEST_SUITES}
--skip-test-list=unstable-tests
--skip-test-list=unstable-tests
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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