From 1d636d50f8abae35d9cb648c7c750e98257bd558 Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sat, 1 Jun 2019 09:51:18 +0200 Subject: [PATCH] simtest: Make tests results independent from sysstat version Set sysstat version to 99.9.9 in test mode. Signed-off-by: Sebastien GODARD --- do_test | 9 +-------- tests/expected.sadf-H | 2 +- tests/expected01.sadf-H | 2 +- version.in | 4 ++++ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/do_test b/do_test index b73f1b9..5c3c3c6 100755 --- a/do_test +++ b/do_test @@ -2,14 +2,7 @@ if [ "$1" = "comp" ] then make CFLAGS="-D DEBUG -D TEST" -fi -if [ "$1" = "all" ] || [ "$1" = "simtest" ] -then +else make distclean ./configure sa_lib_dir=. conf_dir=. sa_dir=tests && make CFLAGS="-D DEBUG -D TEST" && make simtest fi -if [ "$1" = "all" ] || [ "$1" = "test" ] -then - make distclean - ./configure sa_lib_dir=. conf_dir=. sa_dir=tests && make CFLAGS="-D DEBUG" && make test -fi diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H index b3a4051..cabdbaa 100644 --- a/tests/expected.sadf-H +++ b/tests/expected.sadf-H @@ -1,5 +1,5 @@ System activity data file: tests/data.tmp (0x2175) -File created by sar/sadc from sysstat version 12.1.5 +File created by sar/sadc from sysstat version 99.9.9 Genuine sa datafile: yes (0) Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) File date: 2019-04-18 diff --git a/tests/expected01.sadf-H b/tests/expected01.sadf-H index 5480aa6..21bcc55 100644 --- a/tests/expected01.sadf-H +++ b/tests/expected01.sadf-H @@ -1,5 +1,5 @@ System activity data file: tests/data0.tmp (0x2175) -File created by sar/sadc from sysstat version 12.1.5 +File created by sar/sadc from sysstat version 99.9.9 Genuine sa datafile: yes (0) Host: Linux 1.2.3-TEST (SYSSTAT.TEST) 04/18/2019 _x86_64_ (8 CPU) File date: 2019-04-18 diff --git a/version.in b/version.in index df93a3b..5709e1a 100644 --- a/version.in +++ b/version.in @@ -6,7 +6,11 @@ #ifndef _VERSION_H #define _VERSION_H +#ifndef TEST /* sysstat version number */ #define VERSION "@PACKAGE_VERSION@" +#else +#define VERSION "99.9.9" +#endif /* TEST */ #endif /* _VERSION_H */ -- 2.40.0