First shot at a regression test for the config file scanner. A handful of

tests are included; more are needed.



git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/scanner-opt-branch@4202 7894878c-1315-0410-8ee3-d5d059ff63e0

18 files changed, 363 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 07a40915..8da5c785 100644
--- a/Makefile
+++ b/Makefile
@@ -187,6 +187,7 @@ endif
 SRCDIRS += kernel/include
 SRCDIRS += lib prog/detect prog/dump prog/eeprom prog/pwm \
            prog/sensors prog/xeon ${PROG_EXTRA:%=prog/%} etc
+SRCDIRS += lib/test
 
 # Some often-used commands with default options
 MKDIR := mkdir -p
diff --git a/lib/test/Module.mk b/lib/test/Module.mk
new file mode 100644
index 00000000..b9991def
--- /dev/null
+++ b/lib/test/Module.mk
@@ -0,0 +1,26 @@
+LIB_DIR		:= lib
+LIB_TEST_DIR	:= lib/test
+
+LIB_TEST_TARGETS := $(LIB_TEST_DIR)/test-scanner
+LIB_TEST_SOURCES := $(LIB_TEST_DIR)/test-scanner.c
+
+LIBICONV := $(shell if /sbin/ldconfig -p | grep -q libiconv\\.so ; then echo \-liconv; else echo; fi)
+
+LIB_TEST_SCANNER_OBJS := \
+	$(LIB_TEST_DIR)/test-scanner.ro \
+	$(LIB_DIR)/conf-lex.ao \
+	$(LIB_DIR)/error.ao \
+	$(LIB_DIR)/general.ao
+
+$(LIB_TEST_DIR)/test-scanner: $(LIB_TEST_SCANNER_OBJS)
+	$(CC) $(EXLDFLAGS) -o $@ $(LIB_TEST_SCANNER_OBJS) $(LIBICONV) -Llib
+
+all-lib-test: $(LIB_TEST_TARGETS)
+user :: all-lib-test
+
+$(LIB_TEST_DIR)/test-scanner.ro: $(LIB_DIR)/data.h $(LIB_DIR)/conf.h $(LIB_DIR)/conf-parse.h $(LIB_DIR)/scanner.h
+
+clean-lib-test:
+	$(RM) $(LIB_TEST_DIR)/*.rd $(LIB_TEST_DIR)/*.ro 
+	$(RM) $(LIB_TEST_TARGETS)
+clean :: clean-lib-test
diff --git a/lib/test/comment-without-eol.conf b/lib/test/comment-without-eol.conf
new file mode 100644
index 00000000..63a8ebe3
--- /dev/null
+++ b/lib/test/comment-without-eol.conf
@@ -0,0 +1 @@
+# this is a comment without a trailing newline 
\ No newline at end of file
diff --git a/lib/test/comment-without-eol.conf.stdout b/lib/test/comment-without-eol.conf.stdout
new file mode 100644
index 00000000..bbde636c
--- /dev/null
+++ b/lib/test/comment-without-eol.conf.stdout
@@ -0,0 +1 @@
+1: EOF
diff --git a/lib/test/comment.conf b/lib/test/comment.conf
new file mode 100644
index 00000000..74c84e93
--- /dev/null
+++ b/lib/test/comment.conf
@@ -0,0 +1 @@
+# this is a comment
diff --git a/lib/test/comment.conf.stdout b/lib/test/comment.conf.stdout
new file mode 100644
index 00000000..74d06216
--- /dev/null
+++ b/lib/test/comment.conf.stdout
@@ -0,0 +1 @@
+2: EOF
diff --git a/lib/test/empty.conf b/lib/test/empty.conf
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/lib/test/empty.conf
diff --git a/lib/test/empty.conf.stdout b/lib/test/empty.conf.stdout
new file mode 100644
index 00000000..bbde636c
--- /dev/null
+++ b/lib/test/empty.conf.stdout
@@ -0,0 +1 @@
+1: EOF
diff --git a/lib/test/keywords.conf b/lib/test/keywords.conf
new file mode 100644
index 00000000..94eb6825
--- /dev/null
+++ b/lib/test/keywords.conf
@@ -0,0 +1,42 @@
+# chip keyword on a line by itself
+chip
+
+# preceded by whitespace
+	 chip
+
+# with trailing whitespace
+chip	 
+
+# ditto for the rest of the keywords
+label
+
+	  label
+
+label	 	
+
+set
+
+ set
+
+set 
+
+compute
+
+	compute
+
+compute	
+
+bus
+
+	  	bus
+
+bus	  	
+
+ignore
+
+	ignore
+
+ignore	
+
+# keyword followed by EOL/EOF
+chip
diff --git a/lib/test/keywords.conf.stdout b/lib/test/keywords.conf.stdout
new file mode 100644
index 00000000..f4b34bd6
--- /dev/null
+++ b/lib/test/keywords.conf.stdout
@@ -0,0 +1,39 @@
+2: CHIP
+3: EOL
+5: CHIP
+6: EOL
+8: CHIP
+9: EOL
+11: LABEL
+12: EOL
+13: LABEL
+14: EOL
+15: LABEL
+16: EOL
+17: SET
+18: EOL
+19: SET
+20: EOL
+21: SET
+22: EOL
+23: COMPUTE
+24: EOL
+25: COMPUTE
+26: EOL
+27: COMPUTE
+28: EOL
+29: BUS
+30: EOL
+31: BUS
+32: EOL
+33: BUS
+34: EOL
+35: IGNORE
+36: EOL
+37: IGNORE
+38: EOL
+39: IGNORE
+40: EOL
+42: CHIP
+43: EOL
+43: EOF
diff --git a/lib/test/names-errors.conf b/lib/test/names-errors.conf
new file mode 100644
index 00000000..b44ae594
--- /dev/null
+++ b/lib/test/names-errors.conf
@@ -0,0 +1,5 @@
+# keyword with bogus names
+label ?foo
+label bar%
+label baz$foo
+label !
diff --git a/lib/test/names-errors.conf.stdout b/lib/test/names-errors.conf.stdout
new file mode 100644
index 00000000..d02e950d
--- /dev/null
+++ b/lib/test/names-errors.conf.stdout
@@ -0,0 +1,15 @@
+2: LABEL
+2: ERROR
+3: EOL
+3: LABEL
+3: NAME: bar
+3: ERROR
+4: EOL
+4: LABEL
+4: NAME: baz
+4: ERROR
+5: EOL
+5: LABEL
+5: ERROR
+6: EOL
+6: EOF
diff --git a/lib/test/names.conf b/lib/test/names.conf
new file mode 100644
index 00000000..c052f2c7
--- /dev/null
+++ b/lib/test/names.conf
@@ -0,0 +1,25 @@
+# keyword with some unquoted names
+label foo bar
+
+# keyword with escaped newline, names, and whitespace
+label		\
+ foo bar
+
+# names with full range of alpha-numeric and underscores
+label \
+	abcdefg \
+	hijklmnop \
+	qrs \
+	tuv \
+	wx \
+	yz \
+	a0123456789 \
+	982lksdf \
+	_abcd \
+	1234_ \
+	_ \
+	foo_bar_baz \
+	liajesiajef82197fjadf
+
+# keyword with names, immediate EOF
+label foo bar
\ No newline at end of file
diff --git a/lib/test/names.conf.stdout b/lib/test/names.conf.stdout
new file mode 100644
index 00000000..1c3fa031
--- /dev/null
+++ b/lib/test/names.conf.stdout
@@ -0,0 +1,28 @@
+2: LABEL
+2: NAME: foo
+2: NAME: bar
+3: EOL
+5: LABEL
+6: NAME: foo
+6: NAME: bar
+7: EOL
+9: LABEL
+10: NAME: abcdefg
+11: NAME: hijklmnop
+12: NAME: qrs
+13: NAME: tuv
+14: NAME: wx
+15: NAME: yz
+16: NAME: a0123456789
+17: NAME: 982lksdf
+18: NAME: _abcd
+19: NAME: 1234_
+20: NAME: _
+21: NAME: foo_bar_baz
+22: NAME: liajesiajef82197fjadf
+23: EOL
+25: LABEL
+25: NAME: foo
+25: NAME: bar
+25: EOL
+25: EOF
diff --git a/lib/test/non-keywords.conf b/lib/test/non-keywords.conf
new file mode 100644
index 00000000..d7fc754d
--- /dev/null
+++ b/lib/test/non-keywords.conf
@@ -0,0 +1,8 @@
+# these are not keywords
+ignored
+
+labs
+
+extra
+stuff
+
diff --git a/lib/test/non-keywords.conf.stdout b/lib/test/non-keywords.conf.stdout
new file mode 100644
index 00000000..1798c373
--- /dev/null
+++ b/lib/test/non-keywords.conf.stdout
@@ -0,0 +1,9 @@
+2: ERROR
+3: EOL
+4: ERROR
+5: EOL
+6: ERROR
+7: EOL
+7: ERROR
+8: EOL
+9: EOF
diff --git a/lib/test/test-scanner.c b/lib/test/test-scanner.c
new file mode 100644
index 00000000..491b2e75
--- /dev/null
+++ b/lib/test/test-scanner.c
@@ -0,0 +1,85 @@
+#include <stdio.h>
+
+#include "../data.h"
+#include "../conf.h"
+#include "../conf-parse.h"
+#include "../scanner.h"
+
+YYSTYPE sensors_yylval;
+
+int main(void)
+{
+	int result;
+
+	/* init the scanner */
+	if ((result = sensors_scanner_init(stdin)))
+		return result;
+
+	do {
+		result = sensors_yylex();
+
+		printf("%d: ", sensors_yylineno);
+
+		switch (result) {
+
+			case 0:
+				printf("EOF\n");
+				break;
+
+			case NEG:
+				printf("NEG\n");
+				break;
+	
+			case EOL:
+				printf("EOL\n");
+				break;
+	
+			case BUS:
+				printf("BUS\n");
+				break;
+	
+			case LABEL:
+				printf("LABEL\n");
+				break;
+	
+			case SET:
+				printf("SET\n");
+				break;
+	
+			case CHIP:
+				printf("CHIP\n");
+				break;
+	
+			case COMPUTE:
+				printf("COMPUTE\n");
+				break;
+	
+			case IGNORE:
+				printf("IGNORE\n");
+				break;
+	
+			case FLOAT:
+				printf("FLOAT: %f\n", sensors_yylval.value);
+				break;
+	
+			case NAME:
+				printf("NAME: %s\n", sensors_yylval.name);
+				break;
+	
+			case ERROR:
+				printf("ERROR\n");
+				break;
+
+			default:
+				printf("%c\n", (char)result);
+				break;
+		}
+
+	} while (result);
+
+	/* clean up the scanner */
+	sensors_scanner_exit();
+
+	return 0;
+}
+
diff --git a/lib/test/test-scanner.pl b/lib/test/test-scanner.pl
new file mode 100755
index 00000000..4848ab42
--- /dev/null
+++ b/lib/test/test-scanner.pl
@@ -0,0 +1,75 @@
+#!/usr/bin/perl -w
+
+# test-scanner.pl - test script for the libsensors config-file scanner
+# Copyright (C) 2006 Mark M. Hoffman <mhoffman@lightlink.com>
+
+require 5.004;
+
+use strict;
+use Test::More;
+use Test::Cmd;
+
+my ($scenario, $test);
+my @scenarios = (
+	{ base => 'empty', status => 0,
+		desc => 'empty file' },
+	{ base => 'comment', status => 0,
+		desc => 'one comment line' },
+	{ base => 'comment-without-eol', status => 0,
+		desc => 'one comment line, without a trailing newline' },
+	{ base => 'keywords', status => 0,
+		desc => 'keywords with various whitespace variations' },
+	{ base => 'non-keywords', status => 0,
+		desc => 'various invalid keyword scenarios' },
+	{ base => 'names', status => 0,
+		desc => 'normal, unquoted names' },
+	{ base => 'names-errors', status => 0,
+		desc => 'invalid, unquoted names' },
+);
+
+plan tests => ($#scenarios + 1) * 3;
+
+$test = Test::Cmd->new(prog => 'test-scanner', workdir => '');
+
+foreach $scenario (@scenarios) {
+	my ($filename, @stdin, @stdout, @expout, @stderr, @experr, @diff);
+
+	$filename = $scenario->{"base"} . ".conf";
+	open INPUT, "< $filename" or die "Cannot open $filename: $!";
+	@stdin = <INPUT>;
+	close INPUT or die "Cannot close $filename: $!";
+
+	$filename = $scenario->{"base"} . ".conf.stdout";
+	open OUTPUT, "< $filename" or die "Cannot open $filename: $!";
+	@expout = <OUTPUT>;
+	close OUTPUT or die "Cannot close $filename: $!";
+
+	# if stderr file is not present, assume none is expected
+	$filename = $scenario->{"base"} . ".conf.stderr";
+	if (open ERROR, "< $filename") {
+		@experr = <ERROR>;
+		close ERROR or die "Cannot close $filename: $!";
+	} else {
+		@experr = ();
+	}
+
+	$test->string($scenario->{"desc"});
+	$test->run(stdin => \@stdin);
+
+	# test return status
+	ok($scenario->{"status"} == $?, "status: " . $scenario->{"desc"});
+
+	# force the captured outputs into an array - for some reason, the
+	# 'standard invocation' of diff_exact() chokes without this
+	@stdout = $test->stdout;
+	@stderr = $test->stderr;
+
+	# test stdout
+	ok($test->diff_exact(\@stdout, \@expout, \@diff),
+		"stdout: " . $scenario->{"desc"}) or print @diff;
+
+	# test stderr
+	ok($test->diff_exact(\@stderr, \@experr, \@diff),
+		"stderr: " . $scenario->{"desc"}) or print @diff;
+}
+