From 6c2f5abbc42d1a1cedd3b44842f4bd2ea08f030b Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sat, 17 Aug 2019 10:22:49 +0200
Subject: [PATCH] simtest: Fix test for sar forward compatibility

version.h and sysconfig.h files are ignored by default (cf. .gitignore
file). So rename them so that they can be taken into account.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 Makefile.in                 |  8 ++++----
 tests/12.0.1/common.c       |  2 +-
 tests/12.0.1/inisar.c       |  2 +-
 tests/12.0.1/inisysconfig.h | 13 +++++++++++++
 tests/12.0.1/iniversion.h   | 12 ++++++++++++
 tests/12.0.1/ioconf.h       |  2 +-
 tests/12.0.1/sa_common.c    |  2 +-
 7 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 tests/12.0.1/inisysconfig.h
 create mode 100644 tests/12.0.1/iniversion.h

diff --git a/Makefile.in b/Makefile.in
index 799824a..300a83e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -299,12 +299,12 @@ cifsiostat.o: cifsiostat.c cifsiostat.h count.h rd_stats.h version.h common.h
 
 cifsiostat: cifsiostat.o librdstats_light.a libsyscom.a
 
-tests/ini/sa_common.o: tests/ini/sa_common.c tests/ini/version.h tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h tests/ini/ioconf.h tests/ini/sysconfig.h
+tests/ini/sa_common.o: tests/ini/sa_common.c tests/ini/iniversion.h tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h tests/ini/ioconf.h tests/ini/inisysconfig.h
 
 tests/ini/act_sar.o: tests/ini/activity.c tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h tests/ini/pr_stats.h
 	$(CC) -o $@ -c $(CFLAGS) -DSOURCE_SAR $(DFLAGS) $<
 
-tests/ini/rd_stats_light.o: tests/ini/rd_stats.c tests/ini/common.h tests/ini/rd_stats.h tests/ini/ioconf.h tests/ini/sysconfig.h
+tests/ini/rd_stats_light.o: tests/ini/rd_stats.c tests/ini/common.h tests/ini/rd_stats.h tests/ini/ioconf.h tests/ini/inisysconfig.h
 	$(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
 
 tests/ini/count_light.o: tests/ini/count.c tests/ini/common.h tests/ini/rd_stats.h
@@ -316,12 +316,12 @@ tests/ini/libsyscom.a: tests/ini/common.o tests/ini/ioconf.o
 tests/ini/format_sar.o: tests/ini/format.c tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h
 	$(CC) -o $@ -c $(CFLAGS) -DSOURCE_SAR $(DFLAGS) $<
 
-tests/ini/pr_stats.o: tests/ini/pr_stats.c tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h tests/ini/ioconf.h tests/ini/sysconfig.h tests/ini/pr_stats.h
+tests/ini/pr_stats.o: tests/ini/pr_stats.c tests/ini/sa.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h tests/ini/ioconf.h tests/ini/inisysconfig.h tests/ini/pr_stats.h
 
 tests/ini/librdstats_light.a: tests/ini/rd_stats_light.o tests/ini/count_light.o
 	$(AR) rvs $@ $?
 
-tests/ini/inisar.o: tests/ini/inisar.c tests/ini/sa.h tests/ini/version.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h
+tests/ini/inisar.o: tests/ini/inisar.c tests/ini/sa.h tests/ini/iniversion.h tests/ini/common.h tests/ini/rd_stats.h tests/ini/rd_sensors.h
 
 tests/ini/inisar: tests/ini/inisar.o tests/ini/act_sar.o tests/ini/format_sar.o tests/ini/sa_common.o tests/ini/pr_stats.o tests/ini/librdstats_light.a tests/ini/libsyscom.a
 
diff --git a/tests/12.0.1/common.c b/tests/12.0.1/common.c
index d418abf..25ab1fc 100644
--- a/tests/12.0.1/common.c
+++ b/tests/12.0.1/common.c
@@ -33,7 +33,7 @@
 #include <ctype.h>
 #include <libgen.h>
 
-#include "version.h"
+#include "iniversion.h"
 #include "common.h"
 
 #ifdef USE_NLS
diff --git a/tests/12.0.1/inisar.c b/tests/12.0.1/inisar.c
index cc9cacf..c2583bb 100644
--- a/tests/12.0.1/inisar.c
+++ b/tests/12.0.1/inisar.c
@@ -28,7 +28,7 @@
 #include <signal.h>
 #include <sys/stat.h>
 
-#include "version.h"
+#include "iniversion.h"
 #include "sa.h"
 
 #ifdef USE_NLS
diff --git a/tests/12.0.1/inisysconfig.h b/tests/12.0.1/inisysconfig.h
new file mode 100644
index 0000000..3ea6fb7
--- /dev/null
+++ b/tests/12.0.1/inisysconfig.h
@@ -0,0 +1,13 @@
+/*
+ * sysstat: System performance tools for Linux
+ * (C) 1999-2018 by Sebastien Godard (sysstat <at> orange.fr)
+ */
+
+#ifndef _SYSCONFIG_H
+#define _SYSCONFIG_H
+
+/* sysstat configuration directory */
+#define IOCONF		"/etc/sysconfig/sysstat.ioconf"
+#define LOCAL_IOCONF	"./sysstat.ioconf"
+
+#endif  /* _SYSCONFIG_H */
diff --git a/tests/12.0.1/iniversion.h b/tests/12.0.1/iniversion.h
new file mode 100644
index 0000000..d960ebd
--- /dev/null
+++ b/tests/12.0.1/iniversion.h
@@ -0,0 +1,12 @@
+/*
+ * sysstat: System performance tools for Linux
+ * (C) 1999-2018 by Sebastien Godard (sysstat <at> orange.fr)
+ */
+
+#ifndef _VERSION_H
+#define _VERSION_H
+
+/* sysstat version number */
+#define VERSION	"12.0.1"
+
+#endif  /* _VERSION_H */
diff --git a/tests/12.0.1/ioconf.h b/tests/12.0.1/ioconf.h
index 15af348..0d83476 100644
--- a/tests/12.0.1/ioconf.h
+++ b/tests/12.0.1/ioconf.h
@@ -8,7 +8,7 @@
 #ifndef _IOCONF_H
 #define _IOCONF_H
 
-#include "sysconfig.h"
+#include "inisysconfig.h"
 
 #define IOC_NAMELEN	32
 #define IOC_DESCLEN	64
diff --git a/tests/12.0.1/sa_common.c b/tests/12.0.1/sa_common.c
index 1b7389d..d8a2b42 100644
--- a/tests/12.0.1/sa_common.c
+++ b/tests/12.0.1/sa_common.c
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <ctype.h>
 
-#include "version.h"
+#include "iniversion.h"
 #include "sa.h"
 #include "ioconf.h"
 
-- 
2.40.0