Skip to content

Commit 0953729

Browse files
committed
Merge branch 'd-scripts2': Convert CI setup script from bash to D.
1 parent 8d77497 commit 0953729

20 files changed

+295
-121
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ ddoc/packageVersion.ddoc
2424
source/mysql/packageVersion.d
2525

2626
/unit-threaded-*
27+
28+
/run_tests_bin

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ addons:
77
packages: [ libevent-dev ]
88

99
install: $DMD -ofci_setup ci_setup.d && ./ci_setup
10-
script: ./run-tests
10+
script: ./run_tests --mode=combined
1111

1212
matrix:
1313
include:

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ v2.3.0 - TBD
55
Fix metadata tests on MariaDB 10.2 and 10.3
66
- **Internal:** Rework travis config and scripts, including:
77
- General cleanup.
8+
- Convert test scripts from bash/batch to D.
89
- Testing on more versions of MariaDB server.
910
- [#173](https://github.com/mysql-d/mysql-native/issues/173):
1011
Support for per-job `dub.selections.json` overrides (needed for testing on DMD 2.079+).

ci_setup.d

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void main()
2424
{
2525
auto dmdZip = "dmd.2.076.0."~environment["TRAVIS_OS_NAME"]~".zip";
2626
spawnShell("wget http://downloads.dlang.org/releases/2017/"~dmdZip).wait;
27-
spawnShell("unzip -d local-dmd "~dmdZip).wait;
27+
spawnShell("unzip -q -d local-dmd "~dmdZip).wait;
2828
}
2929

3030
// MySQL is not installed by default on OSX build agents

dub.sdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name "mysql-native"
22
description "A native MySQL driver implementation based on Steve Teale's original"
33
license "BSL-1.0"
4-
copyright "Copyright (c) 2011-2017 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
4+
copyright "Copyright (c) 2011-2018 Steve Teale, James W. Oliphant, Simen Endsjø, Sönke Ludwig, Sergey Shamov, and Nick Sabalausky"
55
authors "Steve Teale" "James W. Oliphant" "Simen Endsjø" "Sönke Ludwig" "Sergey Shamov" "Nick Sabalausky"
66

77
dependency "vibe-d:core" version=">=0.7.32 <0.9.0-0" optional=true

find-rdmd.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

run-core-phobos-tests

Lines changed: 0 additions & 4 deletions
This file was deleted.

run-phobos-tests

Lines changed: 0 additions & 39 deletions
This file was deleted.

run-phobos-tests-ut

Lines changed: 0 additions & 4 deletions
This file was deleted.

run-phobos-tests-ut.bat

Lines changed: 0 additions & 14 deletions
This file was deleted.

run-phobos-tests.bat

Lines changed: 0 additions & 7 deletions
This file was deleted.

run-tests

Lines changed: 0 additions & 3 deletions
This file was deleted.

run-tests.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

run-vibe-tests

Lines changed: 0 additions & 10 deletions
This file was deleted.

run-vibe-tests-ut

Lines changed: 0 additions & 4 deletions
This file was deleted.

run-vibe-tests-ut.bat

Lines changed: 0 additions & 6 deletions
This file was deleted.

run-vibe-tests.bat

Lines changed: 0 additions & 6 deletions
This file was deleted.

run_tests

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh
2+
3+
# Compile using $DMD if it exists, otherwise use dmd
4+
if [ -z "$DMD" ]; then
5+
DMD=dmd
6+
fi
7+
8+
echo "DMD=$DMD"
9+
$DMD -ofrun_tests_bin run_tests.d && ./run_tests_bin "$@"

run_tests.bat

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
3+
rem Compile using $DMD if it exists, otherwise use dmd
4+
if not "%DMD%" == "" set DMD=dmd
5+
6+
echo DMD=%DMD%
7+
%DMD% -ofrun_tests_bin run_tests.d && run_tests_bin %*

0 commit comments

Comments
 (0)