Merge pull request #53 from arnaud-lb/github-workflow

Add github workflow

Author: arnaud-lb

.github/workflows/test.yml

@@ -0,0 +1,56 @@
+name: 'Tests'
+
+on:
+    push:
+        branches:
+            - master
+    pull_request:
+
+jobs:
+    tests:
+        name: 'Tests'
+        strategy:
+          matrix:
+            include:
+              - php: '8.0.0'
+                os: 'ubuntu-20.04'
+                expect_native: 1
+                werror: 1
+
+              - php: '8.0.0'
+                os: 'macos-10.15'
+
+              - php: '7.4.0'
+                os: 'ubuntu-20.04'
+                expect_native: 1
+
+              - php: '7.3.0'
+                os: 'ubuntu-20.04'
+                expect_native: 1
+
+        runs-on: ${{ matrix.os }}
+        continue-on-error: ${{ !!matrix.experimental }}
+        env:
+            PHP_VERSION: ${{ matrix.php }}
+            MEMORY_CHECK: ${{ matrix.memcheck }}
+            WERROR: ${{ matrix.werror }}
+            MEMPROF_EXPECT_NATIVE_TRACKING: ${{ matrix.expect_native }}
+        steps:
+            - name: 'Check out repository'
+              uses: 'actions/checkout@v2'
+              with:
+                  path: 'ext'
+
+            - uses: actions/cache@v2
+              with:
+                  path: ~/build-cache/php
+                  key: ${{ runner.os }}-${{ matrix.php }}-${{ matrix.memcheck }}
+
+            - name: 'Build PHP'
+              run: './ext/.github/workflows/test/build-php.sh'
+
+            - name: 'Build extension'
+              run: './ext/.github/workflows/test/build-extension.sh'
+
+            - name: 'Run tests'
+              run: './ext/.github/workflows/test/tests.sh'

.github/workflows/test/build-extension.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+export PATH="$HOME/php/bin:$PATH"
+hash -r
+
+echo "Building extension with PHP version:"
+php --version
+
+if which apt-get >/dev/null 2>&1; then
+    sudo apt-get -y install libjudy-dev
+else
+    brew install traildb/judy/judy
+fi
+
+if [ "$WERROR" = "1" ]; then
+    PHP_EXT_CFLAGS="-Wall -Werror -Wno-deprecated-declarations"
+fi
+
+cd ext
+phpize
+CFLAGS="$PHP_EXT_CFLAGS" ./configure
+make
+
+echo "extension=$(pwd)/modules/memprof.so"|sudo tee "$HOME/php/etc/php/memprof.ini" >/dev/null

.github/workflows/test/build-php.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+set -ex
+
+if [ "$MEMORY_CHECK" = "1" ]; then
+    if which apt-get >/dev/null 2>&1; then
+        sudo apt-get -y install valgrind
+    else
+        break install valgrind
+    fi
+fi
+
+PREFIX="$HOME/php"
+
+if ! [ -f "$HOME/build-cache/php/$PREFIX/bin/php" ]; then
+    echo "PHP build is not cached"
+
+    wget https://secure.php.net/distributions/php-${PHP_VERSION}.tar.bz2
+    tar xjf php-${PHP_VERSION}.tar.bz2
+    cd php-${PHP_VERSION}
+
+    PHP_BUILD_FLAGS="--prefix=$PREFIX --disable-all --enable-cli --enable-cgi --with-config-file-scan-dir=$PREFIX/etc/php --with-zlib --enable-debug"
+
+    if [ $MEMORY_CHECK -eq 1 ]; then
+        PHP_BUILD_FLAGS="$PHP_BUILD_FLAGS --with-valgrind"
+    fi
+
+    ./configure $PHP_BUILD_FLAGS $PHP_BUILD_EXTRA_FLAGS
+    make -j $(nproc)
+    rm -rf "$HOME/build-cache/php"
+    mkdir -p ~/build-cache/php
+    sudo make install INSTALL_ROOT=$HOME/build-cache/php
+else
+    echo "PHP build is cached"
+fi
+
+sudo rsync -av "$HOME/build-cache/php$PREFIX/" "$PREFIX/"
+sudo mkdir -p "$PREFIX/etc/php"

.github/workflows/test/tests.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -xve
+
+export PATH="$HOME/php/bin:$PATH"
+hash -r
+
+cd ext
+
+if [ "$MEMORY_CHECK" = "1" ]; then
+      echo "Enabling memory checking"
+      showmem=--show-mem
+      checkmem=-m
+fi
+
+PHP=$(which php)
+REPORT_EXIT_STATUS=1 TEST_PHP_EXECUTABLE="$PHP" "$PHP" run-tests.php -q $checkmem --show-diff $showmem

memprof.c

@@ -748,7 +748,7 @@ static zend_bool should_autodump(int error_type, const char *message) {
 static char * generate_filename(const char * format) {
 	char * filename;
 	struct timeval tv;
-	int64_t ts;
+	uint64_t ts;
 	const char * output_dir = MEMPROF_G(output_dir);
 	char slash[] = "\0";
 
@@ -759,7 +759,7 @@ static char * generate_filename(const char * format) {
 		slash[0] = DEFAULT_SLASH;
 	}
 
-	spprintf(&filename, 0, "%s%smemprof.%s.%lld", output_dir, slash, format, (long long) ts);
+	spprintf(&filename, 0, "%s%smemprof.%s.%" PRIu64, output_dir, slash, format,  ts);
 
 	return filename;
 }

tests/007.phpt

@@ -1,5 +1,7 @@
 --TEST--
 Enable native profiling
+--SKIPIF--
+<?php getenv('MEMPROF_EXPECT_NATIVE_TRACKING') === '1' || die("skip no native tracking");
 --ENV--
 MEMPROF_PROFILE=native
 --FILE--

tests/autodump-disabled.phpt

@@ -29,7 +29,7 @@ function f() {
 
 f();
 --EXPECTF--
-string(%d) "/tmp/%s"
+string(%d) "/%s"
 bool(true)
 array(3) {
   ["enabled"]=>

tests/autodump.phpt

@@ -29,7 +29,7 @@ function f() {
 
 f();
 --EXPECTF--
-string(%d) "/tmp/%s"
+string(%d) "/%s"
 bool(true)
 array(3) {
   ["enabled"]=>