From 0dfeb4a25fc55f965f57c8517095999a1030c72d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 9 Jun 2020 08:18:06 +0300 Subject: Add into travis.sh check with all custom scripts uncommented --- .github/workflows/clang10_test.yml | 6 ++++++ .github/workflows/gcc10_test.yml | 6 ++++++ .github/workflows/gcc9_test.yml | 6 ++++++ .github/workflows/mariadb.yml | 11 +++++++++++ .github/workflows/mysql.yml | 6 ++++++ tools/ci/travis.sh | 11 +++++++++++ tools/ci/uncomment.sh | 4 ++++ 7 files changed, 50 insertions(+) create mode 100755 tools/ci/uncomment.sh diff --git a/.github/workflows/clang10_test.yml b/.github/workflows/clang10_test.yml index 28cb144f6..5fd53c371 100644 --- a/.github/workflows/clang10_test.yml +++ b/.github/workflows/clang10_test.yml @@ -41,6 +41,7 @@ jobs: SQLHOST: mariadb CC: ${{ matrix.CC }} CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} + PACKET_VERSION: ${{ matrix.PACKET_VERSION }} steps: - uses: actions/checkout@v1 with: @@ -70,3 +71,8 @@ jobs: - name: test run: | ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest diff --git a/.github/workflows/gcc10_test.yml b/.github/workflows/gcc10_test.yml index 1b0909be8..2225fbba1 100644 --- a/.github/workflows/gcc10_test.yml +++ b/.github/workflows/gcc10_test.yml @@ -40,6 +40,7 @@ jobs: SQLHOST: mariadb CC: ${{ matrix.CC }} CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto + PACKET_VERSION: ${{ matrix.PACKET_VERSION }} steps: - uses: actions/checkout@v1 with: @@ -69,3 +70,8 @@ jobs: - name: test run: | ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest diff --git a/.github/workflows/gcc9_test.yml b/.github/workflows/gcc9_test.yml index 4e9dc9bd9..798b6c476 100644 --- a/.github/workflows/gcc9_test.yml +++ b/.github/workflows/gcc9_test.yml @@ -40,6 +40,7 @@ jobs: SQLHOST: mariadb CC: ${{ matrix.CC }} CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} --enable-lto + PACKET_VERSION: ${{ matrix.PACKET_VERSION }} steps: - uses: actions/checkout@v1 with: @@ -69,3 +70,8 @@ jobs: - name: test run: | ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml index 4479e9e4d..5293dd98b 100644 --- a/.github/workflows/mariadb.yml +++ b/.github/workflows/mariadb.yml @@ -38,6 +38,7 @@ jobs: SQLHOST: mysql CC: ${{ matrix.CC }} CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} + PACKET_VERSION: ${{ matrix.PACKET_VERSION }} steps: - uses: actions/checkout@v1 with: @@ -67,3 +68,13 @@ jobs: - name: test run: | ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml index 98e760a87..f26f86892 100644 --- a/.github/workflows/mysql.yml +++ b/.github/workflows/mysql.yml @@ -38,6 +38,7 @@ jobs: SQLHOST: mysql CC: ${{ matrix.CC }} CONFIGURE_FLAGS: CC=${{ matrix.CC }} --enable-debug --enable-Werror --enable-buildbot ${{ matrix.RENEWAL }} ${{ matrix.CLIENT_TYPE }} ${{ matrix.SANITIZER }} ${{ matrix.PACKET_VERSION }} + PACKET_VERSION: ${{ matrix.PACKET_VERSION }} steps: - uses: actions/checkout@v1 with: @@ -67,3 +68,8 @@ jobs: - name: test run: | ./tools/ci/travis.sh test ragnarok ragnarok ragnarok $SQLHOST + + - name: extra test + if: env.PACKET_VERSION != '--enable-packetver=20130724' + run: | + ./tools/ci/travis.sh extratest diff --git a/tools/ci/travis.sh b/tools/ci/travis.sh index 1014787a8..a1a3c7700 100755 --- a/tools/ci/travis.sh +++ b/tools/ci/travis.sh @@ -38,6 +38,7 @@ function usage { echo " $0 test [dbuser] [dbpassword] [dbhost]" echo " $0 getplugins" echo " $0 startmysql" + echo " $0 extratest" exit 1 } @@ -251,6 +252,7 @@ EOF run_server ./map-server "$PLUGINS --load-plugin db2sql --db2sql" run_server ./map-server "$PLUGINS --load-plugin db2sql --itemdb2sql" run_server ./map-server "$PLUGINS --load-plugin db2sql --mobdb2sql" +# look like works on windows only # echo "run all servers with dbghelpplug" # run_server ./login-server "$PLUGINS --load-plugin dbghelpplug" # run_server ./char-server "$PLUGINS --load-plugin dbghelpplug" @@ -263,6 +265,15 @@ EOF echo "run all servers with script_mapquit" run_server ./map-server "$PLUGINS --load-plugin script_mapquit" ;; + extratest) + export ASAN_OPTIONS=detect_stack_use_after_return=true:strict_init_order=true:detect_odr_violation=0 + PLUGINS="--load-plugin HPMHooking" + echo "run map server with uncommented old and custom scripts" + find ./npc -type f -name "*.conf" -exec ./tools/ci/uncomment.sh {} \; + run_server ./login-server "$PLUGINS" + run_server ./char-server "$PLUGINS" + run_server ./map-server "$ARGS $PLUGINS" + ;; getplugins) echo "Cloning plugins repository..." # Nothing to clone right now, all relevant plugins are part of the repository. diff --git a/tools/ci/uncomment.sh b/tools/ci/uncomment.sh new file mode 100755 index 000000000..22fe4e966 --- /dev/null +++ b/tools/ci/uncomment.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +sed -i "s|//\"npc/|\"npc/|g" $1 +sed -i "s|\"npc/location/to/script.txt\"|//\"npc/location/to/script.txt\"|g" $1 -- cgit v1.2.3-60-g2f50