From ce1d2a57de01b999663d9503a75ae041d9b038ff Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Sun, 2 Jun 2019 16:04:32 +0200 Subject: [PATCH] Add/update non regression tests Signed-off-by: Sebastien GODARD --- .gitignore | 10 +--------- Makefile.in | 3 +-- cifsiostat.c | 4 ++++ configure | 28 ++-------------------------- configure.in | 10 +--------- iostat.c | 2 +- mpstat.c | 4 ++-- pidstat.c | 4 ++++ sadf.c | 4 ++++ systest.c | 12 +++++++++++- systest.h | 4 ++++ tapestat.c | 4 ++++ tests/{00300.in => 00300} | 2 +- tests/{00310.in => 00310} | 2 +- tests/{00320.in => 00320} | 2 +- tests/00330 | 8 ++++++++ tests/00340 | 8 ++++++++ tests/{00400.in => 00400} | 2 +- tests/{00410.in => 00410} | 2 +- tests/{01130.in => 01130} | 2 +- tests/{01230.in => 01230} | 2 +- tests/01380 | 5 +++++ tests/01382 | 1 + tests/01385 | 1 + tests/TLIST | 8 ++++++++ tests/expected.sar-sigint | 10 ++++++++++ tests/out.sar-sigint | Bin 0 -> 75740 bytes tests/{rt00010.in => rt00010} | 2 +- tests/{rt00020.in => rt00020} | 2 +- tests/variables.in | 2 ++ 30 files changed, 91 insertions(+), 59 deletions(-) rename tests/{00300.in => 00300} (90%) rename tests/{00310.in => 00310} (79%) rename tests/{00320.in => 00320} (80%) create mode 100644 tests/00330 create mode 100644 tests/00340 rename tests/{00400.in => 00400} (93%) rename tests/{00410.in => 00410} (94%) rename tests/{01130.in => 01130} (81%) rename tests/{01230.in => 01230} (81%) create mode 100644 tests/01380 create mode 100644 tests/01382 create mode 100644 tests/01385 create mode 100644 tests/expected.sar-sigint create mode 100644 tests/out.sar-sigint rename tests/{rt00010.in => rt00010} (87%) rename tests/{rt00020.in => rt00020} (86%) create mode 100644 tests/variables.in diff --git a/.gitignore b/.gitignore index f5c0952..42ed565 100644 --- a/.gitignore +++ b/.gitignore @@ -49,13 +49,5 @@ core TAGS nls/*.gmo tests/*.tmp -tests/00300 -tests/00310 -tests/00320 -tests/00400 -tests/00410 -tests/01130 -tests/01230 -tests/rt00010 -tests/rt00020 tests/sa[012]* +tests/variables diff --git a/Makefile.in b/Makefile.in index 7cb8224..d51a6f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -624,8 +624,7 @@ almost-distclean: clean nls/sysstat.pot rm -f cron/sysstat-collect.service cron/sysstat-collect.timer cron/sysstat-summary.service cron/sysstat-summary.timer rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5 - rm -f tests/00300 tests/00310 tests/00320 tests/00400 tests/00410 tests/01130 tests/01230 - rm -f tests/rt00010 tests/rt00020 + rm -f tests/variables rm -f man/cifsiostat.1 rm -f *.log config.status rm -rf autom4te.cache diff --git a/cifsiostat.c b/cifsiostat.c index ccc854c..936f95c 100644 --- a/cifsiostat.c +++ b/cifsiostat.c @@ -46,6 +46,10 @@ char *sccsid(void) { return (SCCSID); } #endif +#ifdef TEST +void int_handler(int n) { return; } +#endif + unsigned long long uptime_cs[2] = {0, 0}; struct cifs_stats *st_cifs[2]; struct io_hdr_stats *st_hdr_cifs; diff --git a/configure b/configure index c10afd6..630f406 100755 --- a/configure +++ b/configure @@ -5600,23 +5600,7 @@ ac_config_files="$ac_config_files man/iostat.1:man/iostat.in" # File must be renamed ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in" # File must be renamed -ac_config_files="$ac_config_files tests/00300" - -ac_config_files="$ac_config_files tests/00310" - -ac_config_files="$ac_config_files tests/00320" - -ac_config_files="$ac_config_files tests/00400" - -ac_config_files="$ac_config_files tests/00410" - -ac_config_files="$ac_config_files tests/01130" - -ac_config_files="$ac_config_files tests/01230" - -ac_config_files="$ac_config_files tests/rt00010" - -ac_config_files="$ac_config_files tests/rt00020" +ac_config_files="$ac_config_files tests/variables" ac_config_files="$ac_config_files Makefile" @@ -6350,15 +6334,7 @@ do "man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;; "man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;; "man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;; - "tests/00300") CONFIG_FILES="$CONFIG_FILES tests/00300" ;; - "tests/00310") CONFIG_FILES="$CONFIG_FILES tests/00310" ;; - "tests/00320") CONFIG_FILES="$CONFIG_FILES tests/00320" ;; - "tests/00400") CONFIG_FILES="$CONFIG_FILES tests/00400" ;; - "tests/00410") CONFIG_FILES="$CONFIG_FILES tests/00410" ;; - "tests/01130") CONFIG_FILES="$CONFIG_FILES tests/01130" ;; - "tests/01230") CONFIG_FILES="$CONFIG_FILES tests/01230" ;; - "tests/rt00010") CONFIG_FILES="$CONFIG_FILES tests/rt00010" ;; - "tests/rt00020") CONFIG_FILES="$CONFIG_FILES tests/rt00020" ;; + "tests/variables") CONFIG_FILES="$CONFIG_FILES tests/variables" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/configure.in b/configure.in index 9108284..48b9a31 100644 --- a/configure.in +++ b/configure.in @@ -635,15 +635,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in]) # File must be renamed AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in]) # File must be renamed AC_CONFIG_FILES([man/iostat.1:man/iostat.in]) # File must be renamed AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in]) # File must be renamed -AC_CONFIG_FILES([tests/00300]) -AC_CONFIG_FILES([tests/00310]) -AC_CONFIG_FILES([tests/00320]) -AC_CONFIG_FILES([tests/00400]) -AC_CONFIG_FILES([tests/00410]) -AC_CONFIG_FILES([tests/01130]) -AC_CONFIG_FILES([tests/01230]) -AC_CONFIG_FILES([tests/rt00010]) -AC_CONFIG_FILES([tests/rt00020]) +AC_CONFIG_FILES([tests/variables]) AC_OUTPUT(Makefile) diff --git a/iostat.c b/iostat.c index 42353e6..897104e 100644 --- a/iostat.c +++ b/iostat.c @@ -1921,7 +1921,7 @@ void rw_io_stat_loop(long int count, struct tm *rectime, int iodev_nr, int dlist if (count) { curr ^= 1; - pause(); + __pause(); if (sigint_caught) { /* SIGINT signal caught => Terminate JSON output properly */ diff --git a/mpstat.c b/mpstat.c index 69f26c1..163f2bc 100644 --- a/mpstat.c +++ b/mpstat.c @@ -1884,7 +1884,7 @@ void rw_mpstat_loop(int dis_hdr, int rows) int_act.sa_handler = int_handler; sigaction(SIGINT, &int_act, NULL); - pause(); + __pause(); if (sigint_caught) /* SIGINT signal caught during first interval: Exit immediately */ @@ -1938,7 +1938,7 @@ void rw_mpstat_loop(int dis_hdr, int rows) if (count) { - pause(); + __pause(); if (sigint_caught) { /* SIGINT signal caught => Display average stats */ diff --git a/pidstat.c b/pidstat.c index 64e6d9f..04d1d61 100644 --- a/pidstat.c +++ b/pidstat.c @@ -52,6 +52,10 @@ char *sccsid(void) { return (SCCSID); } #endif +#ifdef TEST +void int_handler(int n) { return; } +#endif + unsigned long long tot_jiffies[3] = {0, 0, 0}; unsigned long long uptime_cs[3] = {0, 0, 0}; struct pid_stats *st_pid_list[3] = {NULL, NULL, NULL}; diff --git a/sadf.c b/sadf.c index 2785846..2b35c42 100644 --- a/sadf.c +++ b/sadf.c @@ -48,6 +48,10 @@ char *sccsid(void) { return (SCCSID); } #endif +#ifdef TEST +void int_handler(int n) { return; } +#endif + long interval = -1, count = 0; /* TRUE if data read from file don't match current machine's endianness */ diff --git a/systest.c b/systest.c index 974455d..9b1a6ed 100644 --- a/systest.c +++ b/systest.c @@ -34,6 +34,7 @@ time_t __unix_time = 0; extern long interval; +extern int sigint_caught; /* *************************************************************************** @@ -117,7 +118,7 @@ char *get_env_value(char *c) void next_time_step(void) { static int root_nr = 1; - char rootf[64]; + char rootf[64], testf[64]; __unix_time += interval; @@ -127,6 +128,15 @@ void next_time_step(void) } sprintf(rootf, "%s%d", ROOTFILE, ++root_nr); + sprintf(testf, "%s/%s", TESTDIR, rootf); + if (access(testf, F_OK) < 0) { + if (errno = ENOENT) { + /* No more kernel directories: Simulate a Ctrl/C */ + int_handler(0); + return ; + } + } + if (symlink(rootf, ROOTDIR) < 0) { perror("link"); exit(1); diff --git a/systest.h b/systest.h index fd4e70e..dce18b2 100644 --- a/systest.h +++ b/systest.h @@ -23,6 +23,7 @@ #define ROOTDIR "./tests/root" #define ROOTFILE "root" +#define TESTDIR "./tests" #else @@ -54,6 +55,9 @@ void get_unix_time (time_t *); void next_time_step (); + +void int_handler + (int); #endif #endif /* _SYSTEST_H */ diff --git a/tapestat.c b/tapestat.c index a8ea460..56620a4 100644 --- a/tapestat.c +++ b/tapestat.c @@ -64,6 +64,10 @@ char *sccsid(void) { return (SCCSID); } #endif +#ifdef TEST +void int_handler(int n) { return; } +#endif + int cpu_nr = 0; /* Nb of processors on the machine */ int flags = 0; /* Flag for common options and system state */ diff --git a/tests/00300.in b/tests/00300 similarity index 90% rename from tests/00300.in rename to tests/00300 index 55bf8bf..7338efe 100644 --- a/tests/00300.in +++ b/tests/00300 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./sadf -j tests/data.tmp -C -- -A | $VER_JSON >/dev/null && ./sadf -j tests/data.tmp | $VER_JSON >/dev/null && ./sadf -t -j tests/data.tmp | $VER_JSON >/dev/null; fi diff --git a/tests/00310.in b/tests/00310 similarity index 79% rename from tests/00310.in rename to tests/00310 index 3d33e1b..392d257 100644 --- a/tests/00310.in +++ b/tests/00310 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./mpstat -A -o JSON | $VER_JSON >/dev/null; fi diff --git a/tests/00320.in b/tests/00320 similarity index 80% rename from tests/00320.in rename to tests/00320 index be66771..b143089 100644 --- a/tests/00320.in +++ b/tests/00320 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./iostat -t -p ALL -o JSON | $VER_JSON >/dev/null; fi diff --git a/tests/00330 b/tests/00330 new file mode 100644 index 0000000..8ebccf6 --- /dev/null +++ b/tests/00330 @@ -0,0 +1,8 @@ +. tests/variables +if [ ! -z "$VER_JSON" ]; then + rm -f tests/root + ln -s root1 tests/root + ./mpstat -o JSON 1 10 | $VER_JSON >/dev/null; +fi +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/00340 b/tests/00340 new file mode 100644 index 0000000..77c75fa --- /dev/null +++ b/tests/00340 @@ -0,0 +1,8 @@ +. tests/variables +if [ ! -z "$VER_JSON" ]; then + rm -f tests/root + ln -s root1 tests/root + ./iostat -p ALL -o JSON 1 10 | $VER_JSON >/dev/null; +fi +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/00400.in b/tests/00400 similarity index 93% rename from tests/00400.in rename to tests/00400 index 5779ca6..cd1bfae 100644 --- a/tests/00400.in +++ b/tests/00400 @@ -1,4 +1,4 @@ -VER_XML=@VER_XML@ +. tests/variables if [ ! -z "$VER_XML" ]; then ./sadf -x tests/data.tmp -C -- -A | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -T -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null; fi diff --git a/tests/00410.in b/tests/00410 similarity index 94% rename from tests/00410.in rename to tests/00410 index 2c3b241..9ac3ecc 100644 --- a/tests/00410.in +++ b/tests/00410 @@ -1,4 +1,4 @@ -VER_XML=@VER_XML@ +. tests/variables if [ ! -z "$VER_XML" ]; then ./sadf -x tests/data.tmp -C -- -A | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null && ./sadf -x tests/data.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null && ./sadf -t -x tests/data.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null; fi diff --git a/tests/01130.in b/tests/01130 similarity index 81% rename from tests/01130.in rename to tests/01130 index 1f577ca..60640a4 100644 --- a/tests/01130.in +++ b/tests/01130 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./sadf -j tests/data0.tmp -- -A | $VER_JSON >/dev/null; fi diff --git a/tests/01230.in b/tests/01230 similarity index 81% rename from tests/01230.in rename to tests/01230 index 1f577ca..60640a4 100644 --- a/tests/01230.in +++ b/tests/01230 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./sadf -j tests/data0.tmp -- -A | $VER_JSON >/dev/null; fi diff --git a/tests/01380 b/tests/01380 new file mode 100644 index 0000000..d0f57b1 --- /dev/null +++ b/tests/01380 @@ -0,0 +1,5 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -o tests/sa-sigint.tmp 1 10 > /dev/null +rm -f tests/root +ln -s root1 tests/root diff --git a/tests/01382 b/tests/01382 new file mode 100644 index 0000000..f5ce0ed --- /dev/null +++ b/tests/01382 @@ -0,0 +1 @@ +LC_ALL=C TZ=GMT ./sar -f tests/sa-sigint.tmp -m CPU > tests/out.sar-sigint.tmp diff --git a/tests/01385 b/tests/01385 new file mode 100644 index 0000000..fea0c2a --- /dev/null +++ b/tests/01385 @@ -0,0 +1 @@ +diff -u tests/out.sar-sigint.tmp tests/expected.sar-sigint diff --git a/tests/TLIST b/tests/TLIST index 544597f..f4acd66 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -34,6 +34,10 @@ 00300 ./sadf -j tests/data.tmp -C -- -A | $VER_JSON >/dev/null && ./sadf -j tests/data.tmp | $VER_JSON >/dev/null && ./sadf -t -j tests/data.tmp | $VER_JSON >/dev/null 00310 ./mpstat -A -o JSON | $VER_JSON >/dev/null 00320 ./iostat -t -p ALL -o JSON | $VER_JSON >/dev/null +00330 ./mpstat -o JSON 1 10 | $VER_JSON >/dev/null; + [Simulate a Ctrl/C within mpstat] +00340 ./iostat -p ALL -o JSON 1 10 | $VER_JSON >/dev/null; + [Simulate a Ctrl/C within iostat] ===== Checking XML output validity 00400 ./sadf -x tests/data.tmp -C -- -A | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null && ./sadf -T -x tests/data.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null @@ -162,6 +166,10 @@ [Create datafile sa20190502] 01372 LC_ALL=C TZ=GMT ./sar -f tests/sa20190502 > tests/out.sar-D.tmp 01375 diff -u tests/out.sar-D.tmp tests/expected.sar-D +01380 LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -o tests/sa-sigint.tmp 1 10 > /dev/null + [Create binary datafile sa-sigint.tmp. Stop with a simulated Ctrl/C] +01382 LC_ALL=C TZ=GMT ./sar -f tests/sa-sigint.tmp -m CPU > tests/out.sar-sigint.tmp +01385 diff -u tests/out.sar-sigint.tmp tests/expected.sar-sigint ===== Testing error cases 01400 LC_ALL=C TZ=GMT ./sar -f tests/data-trunc 2>&1 | grep "End of system activity file unexpected" >/dev/null diff --git a/tests/expected.sar-sigint b/tests/expected.sar-sigint new file mode 100644 index 0000000..cbb56d8 --- /dev/null +++ b/tests/expected.sar-sigint @@ -0,0 +1,10 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 05/02/19 _x86_64_ (8 CPU) + +00:00:03 CPU MHz +00:00:04 all 3522.54 +00:00:05 all 3522.54 +00:00:06 all 3522.54 +00:00:07 all 3522.54 +00:00:08 all 3517.54 +00:00:09 all 3517.54 +Average: all 3520.87 diff --git a/tests/out.sar-sigint b/tests/out.sar-sigint new file mode 100644 index 0000000000000000000000000000000000000000..f6e890938eed75bbdcd25c6d67dc11c86d495a83 GIT binary patch literal 75740 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 U38XajLb)Zyi;GjQHn7J32S<1fPyhe` literal 0 HcmV?d00001 diff --git a/tests/rt00010.in b/tests/rt00010 similarity index 87% rename from tests/rt00010.in rename to tests/rt00010 index a8adb59..17f7a78 100644 --- a/tests/rt00010.in +++ b/tests/rt00010 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./iostat -y 1 1 -o JSON -p ALL ALL -xt | $VER_JSON >/dev/null && ./iostat 1 1 -o JSON | $VER_JSON >/dev/null; fi diff --git a/tests/rt00020.in b/tests/rt00020 similarity index 86% rename from tests/rt00020.in rename to tests/rt00020 index 5dc0e7d..f69f68b 100644 --- a/tests/rt00020.in +++ b/tests/rt00020 @@ -1,4 +1,4 @@ -VER_JSON=@VER_JSON@ +. tests/variables if [ ! -z "$VER_JSON" ]; then ./mpstat 1 1 -o JSON | $VER_JSON >/dev/null && ./mpstat -A 1 1 -o JSON | $VER_JSON >/dev/null; fi diff --git a/tests/variables.in b/tests/variables.in new file mode 100644 index 0000000..a8cf53f --- /dev/null +++ b/tests/variables.in @@ -0,0 +1,2 @@ +VER_JSON=@VER_JSON@ +VER_XML=@VER_XML@ -- 2.40.0