mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-19 19:40:49 +00:00
Merge scanner-opt-branch (r4121:r4221) to trunk.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4222 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
f952e5095f
commit
9c3a817633
19 files changed
+564
-95
No files matched your search
@@ -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
|
||||
@@ -0,0 +1 @@
|
||||
# this is a comment without a trailing newline
|
||||
@@ -0,0 +1 @@
|
||||
1: EOF
|
||||
@@ -0,0 +1 @@
|
||||
# this is a comment
|
||||
@@ -0,0 +1 @@
|
||||
2: EOF
|
||||
Whitespace-only changes.
@@ -0,0 +1 @@
|
||||
1: EOF
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1,5 @@
|
||||
# keyword with bogus names
|
||||
label ?foo
|
||||
label bar%
|
||||
label baz$foo
|
||||
label !
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -0,0 +1,8 @@
|
||||
# these are not keywords
|
||||
ignored
|
||||
|
||||
labs
|
||||
|
||||
extra
|
||||
stuff
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
2: ERROR
|
||||
3: EOL
|
||||
4: ERROR
|
||||
5: EOL
|
||||
6: ERROR
|
||||
7: EOL
|
||||
7: ERROR
|
||||
8: EOL
|
||||
9: EOF
|
||||
@@ -0,0 +1,103 @@
|
||||
/*
|
||||
test-scanner.c - Regression test driver for the libsensors config file scanner.
|
||||
Copyright (C) 2006 Mark M. Hoffman <mhoffman@lightlink.com>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; version 2 of the License.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
Executable
+89
@@ -0,0 +1,89 @@
|
||||
#!/usr/bin/perl -w
|
||||
|
||||
# test-scanner.pl - test script for the libsensors config-file scanner
|
||||
# Copyright (C) 2006 Mark M. Hoffman <mhoffman@lightlink.com>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; version 2 of the License.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
#
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user