diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2015-08-14 10:46:13 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2015-08-26 11:01:09 +0200 |
| commit | 09394e857f7184dc8e7bb518b1647843be6cc431 (patch) | |
| tree | fa0d9b7748a9e518df669dae76f0827daff487c9 | |
| parent | 2e88eb705bd584720d0940b4a5db5d99d1e9b38e (diff) | |
build-sys: Remove test_spice_version.h
This script was used at make distcheck time to verify consistency of the
version number defined in configure.ac and in spice-server headers.
Since commit ab12cf414c, these 2 version numbers can no longer be out of
sync, so we can drop this script.
| -rw-r--r-- | server/Makefile.am | 3 | ||||
| -rwxr-xr-x | server/tests/test_spice_version.sh | 42 |
2 files changed, 0 insertions, 45 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index db1249d..f1da60b 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -149,6 +149,3 @@ EXTRA_DIST = \ $(NULL) BUILT_SOURCES = $(spice_built_sources) - -dist-hook: - if test ./tests/test_spice_version.sh && ! test ./tests/test_spice_version.sh; then exit 1; fi diff --git a/server/tests/test_spice_version.sh b/server/tests/test_spice_version.sh deleted file mode 100755 index 5e5b173..0000000 --- a/server/tests/test_spice_version.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -ROOT=$(dirname $0)/../../ -INCLUDE="-I$ROOT -I$ROOT/spice-common/spice-protocol/" -TEMP=`mktemp -d` - -cat > $TEMP/check_version.c <<EOF -#include <stdio.h> -#include "server/spice.h" - -int main(void) -{ - printf("%d.%d.%d\n", SPICE_SERVER_VERSION >> 16, - (SPICE_SERVER_VERSION >> 8) & 0xff, - SPICE_SERVER_VERSION & 0xff); - return 0; -} -EOF - -if ! gcc -o $TEMP/check_version $INCLUDE $TEMP/check_version.c ; then - echo "failed to compile tester" - exit -1 -fi - -INCLUDE_VERSION=`$TEMP/check_version` -rm -Rf $TEMP - -CONF_MAJOR=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MAJOR\]' | sed -e 's/m4_define(\[SPICE_MAJOR\],\(.*\))/\1/'` -CONF_MINOR=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MINOR\]' | sed -e 's/m4_define(\[SPICE_MINOR\],\(.*\))/\1/'` -CONF_MICRO=`cat $ROOT/configure.ac | grep 'm4_define(\[SPICE_MICRO\]' | sed -e 's/m4_define(\[SPICE_MICRO\],\(.*\))/\1/'` -CONF_VERSION=`printf %d.%d.%d $CONF_MAJOR $CONF_MINOR $CONF_MICRO` -if [ $CONF_VERSION != $INCLUDE_VERSION ] ; then - echo "BAD: version in server/spice.h" - echo $INCLUDE_VERSION - echo "doesn't match version in configure.ac" - echo $CONF_VERSION - echo "please fix before doing a release" - exit 1 -else - echo "OK: both versions are $CONF_VERSION" -fi -exit 0 |