diff options
author | Chris Dearman <chris@mips.com> | 2012-10-17 19:54:01 -0700 |
---|---|---|
committer | Chris Dearman <chris@mips.com> | 2012-10-18 11:48:33 -0700 |
commit | 37550cf5a86c7ca7424a2a318dd64e550f13f5df (patch) | |
tree | 9e4446fbd9942dc8ba6e981f3106c17c08ba125c /pan | |
parent | ec6edca7aa42b6affd989ef91b5897f96795e40f (diff) |
Remove whitespace at end of line
This is a scripted change done using the following command:
find . -type d -name .git -prune -o \
-type f \! -name \*\~ \! -name .\#\* \
\! -name \*.gz \! -name \*.pdf \! -name \*.patch -print0 | \
xargs -0 sed -i -e 's/[\t ]*$//'
Signed-off-by: Chris Dearman <chris@mips.com>
Diffstat (limited to 'pan')
-rw-r--r-- | pan/Makefile | 2 | ||||
-rw-r--r-- | pan/cgi/README | 12 | ||||
-rwxr-xr-x | pan/cgi/browse.cgi | 10 | ||||
-rwxr-xr-x | pan/cgi/reconsile.cgi | 28 | ||||
-rwxr-xr-x | pan/cgi/results.cgi | 8 | ||||
-rw-r--r-- | pan/reporter.h | 2 | ||||
-rw-r--r-- | pan/scan.l | 44 | ||||
-rw-r--r-- | pan/symbol.h | 4 | ||||
-rw-r--r-- | pan/zoolib.h | 4 |
9 files changed, 57 insertions, 57 deletions
diff --git a/pan/Makefile b/pan/Makefile index a6e2bdea6..4cc6466aa 100644 --- a/pan/Makefile +++ b/pan/Makefile @@ -54,6 +54,6 @@ ltp-scanner: scan.o ltp-scanner.o reporter.o tag_report.o symbol.o splitstr.o de # flex does some whacky junk when it generates files on the fly, so let's make # sure gcc doesn't get lost... vpath %.c $(abs_srcdir):$(abs_builddir))) -vpath %.l $(abs_srcdir) +vpath %.l $(abs_srcdir) include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/pan/cgi/README b/pan/cgi/README index 740e1069d..544c5466b 100644 --- a/pan/cgi/README +++ b/pan/cgi/README @@ -1,5 +1,5 @@ Here are some CGI scripts I was using to view and compare RTS style output. -It will probably need a little more tweaking to be useful to LTP. +It will probably need a little more tweaking to be useful to LTP. Expectations: @@ -11,16 +11,16 @@ Expectations: <ISO Date> ISO standard format date. i.e. YYYYmmDDHHMM <suite> The name of the pan file that was used <type> One of driver, scanner, or summary - + driver - the raw output from pan with <<<test_end>>> - scanner - the output from scanner + scanner - the output from scanner summary - a very brief table listing how many tests passed, failed, didn't run, etc. This wasn't released. Scripts: results.cgi - + This lists out all of the results that are the results directory. It provides links to the driver output, scanned results, and summary for each suite. The sort order is host, date, suite. On the results @@ -31,11 +31,11 @@ Scripts: This is a more complex form that I started working on. It allows you to compare as many results as you want, side by side. Also, I started - working on sorting the results different ways, but didn't get too far. + working on sorting the results different ways, but didn't get too far. The side by side comparison is done with in reconsile.cgi reconsile.cgi - + This script compares multiple scanner files and shows the differences side by side in a table. It expects to find .scanner files for the results it is comparing. diff --git a/pan/cgi/browse.cgi b/pan/cgi/browse.cgi index ac1d17bb9..49fda6fbd 100755 --- a/pan/cgi/browse.cgi +++ b/pan/cgi/browse.cgi @@ -74,7 +74,7 @@ sub get_result_uname { # Create the headers row, adding links for sorting options sub print_headers { - + print "\n<tr>"; for($i = 0; $i <= $#rso; $i++) { @@ -104,7 +104,7 @@ unless (chdir("/usr/tests/ltp/results")) { @extra_path = split(/\//, $ENV{PATH_INFO}); # rso = Result Sort Order -# rsd = Result Sort Direction +# rsd = Result Sort Direction #@rso = (HOST,SUITE, DATE, UNAME); @rso = (SUITE, HOST, DATE, UNAME); @rsd = (1, 1, -1, 1); @@ -127,11 +127,11 @@ if ($sort_order = param("sort")) { } if ($#extra_path > 0) { - + } else { %results = (); - + # run through the files in the results directory @driver_files = <*driver*>; foreach $df (@driver_files) { @@ -203,7 +203,7 @@ if ($#extra_path > 0) { if ($i == $#rso) { # last column print " <input type=checkbox name=results value=\"$this->{HOST}.$this->{DATE}.$this->{SUITE}\">"; - + } diff --git a/pan/cgi/reconsile.cgi b/pan/cgi/reconsile.cgi index 8c3aa9c38..da131f471 100755 --- a/pan/cgi/reconsile.cgi +++ b/pan/cgi/reconsile.cgi @@ -60,7 +60,7 @@ foreach $result_filename (@result_filenames) { $result_details->[$i]->{SUITE} = $suite; while ($line = <F>) { # check for the end of the header - if ($line =~ /^-+/) { + if ($line =~ /^-+/) { # we've reached the top of the scanner output # grab the rest and stop the while loop; @rest = <F>; @@ -115,8 +115,8 @@ foreach $rtcs (@result_testcases) { } # here is the loop that prints the data into a multi-column table with the test -# tags grouped together. - +# tags grouped together. + print "</pre>"; print "<table border=1>\n"; @@ -141,9 +141,9 @@ while (1) { # if there wasn't anything left, leave $somethingleft = 0; foreach $rtcs (@result_testcases) { - if ($#$rtcs > -1) { - $somethingleft = 1; - last; + if ($#$rtcs > -1) { + $somethingleft = 1; + last; } } unless ($somethingleft) { last; } @@ -151,7 +151,7 @@ while (1) { # find the Lowest Common Record @tops = (); foreach $rtcs (@result_testcases) { - if (@$rtcs[0]) { + if (@$rtcs[0]) { push(@tops, copy_record(@$rtcs[0])); } } @@ -160,7 +160,7 @@ while (1) { || $a->{TC} <=> $b->{TC} || $a->{TC} cmp $b->{TC} || $a->{STATUS} cmp $b->{STATUS}} @tops; - + $LCR = $tops[0]; # check to see if everyone matches @@ -177,9 +177,9 @@ while (1) { } # if everyone does match (status included) shift them # and move on. - if ($matches == ($#result_testcases+1)) { + if ($matches == ($#result_testcases+1)) { foreach $rtcs (@result_testcases) { shift(@$rtcs); } - next; + next; } # if we've already output stuff related to this test tag, @@ -194,10 +194,10 @@ while (1) { # walk through the lists again outputting as we match $column = 0; foreach $rtcs (@result_testcases) { - if (! @$rtcs[0]) { + if (! @$rtcs[0]) { print "<td><td><td>"; $column++; - next; + next; } elsif (@$rtcs[0]->{TAG} eq $LCR->{TAG} && @$rtcs[0]->{TCID} eq $LCR->{TCID} && @$rtcs[0]->{TC} eq $LCR->{TC}) { @@ -230,7 +230,7 @@ while (1) { } $column++; } - print "<td>$LCR->{CONTACT}</tr>\n"; + print "<td>$LCR->{CONTACT}</tr>\n"; } print "</table>"; @@ -246,5 +246,5 @@ sub copy_record { $copy->{STATUS} = $rec->{STATUS}; $copy->{CONTACT} = $rec->{CONTACT}; return $copy; - + } diff --git a/pan/cgi/results.cgi b/pan/cgi/results.cgi index b88445a7e..f84a92c7d 100755 --- a/pan/cgi/results.cgi +++ b/pan/cgi/results.cgi @@ -41,7 +41,7 @@ if ($get_df) { if ($line =~ /^tag=$zoom_tag /) { print "<<<test_start>>>\n"; print $line; - + do { $line = <DF>; print $line; @@ -76,7 +76,7 @@ if ($get_df) { foreach (@rest) { s/(\S+)/<a href="results.cgi?get_df=$host.$datestr.$suite.driver&zoom_tag=\1">\1<\/a>/; - # colorize the status column + # colorize the status column s/\bPASS\b/\<font color\=green\>PASS\<\/font\>/i; s/\bFAIL\b/\<font color\=\"red\"\>FAIL\<\/font\>/i; s/\bCONF\b/\<font color\=\"yellow\"\>CONF\<\/font\>/i; @@ -141,7 +141,7 @@ if ($get_df) { if ($indent <= 1) { ($year, $month, $day, $hour, $min) = ($thisdate =~ /(\d+)(\d{2})(\d{2})(\d{2})(\d{2})/); print "<tr><td><td>$year-$month-$day $hour:$min\n"; - } + } # suite level if ($indent <= 2) { print "<tr><td><td><td>"; @@ -149,7 +149,7 @@ if ($get_df) { print " [<a href=\"results.cgi?get_df=$rp->{DRIVER_FILE}\">driver output</a>]"; print " [<a href=\"results.cgi?get_df=$thishost.$thisdate.$thissuite.scanner\">results</a>]"; print " [<a href=\"results.cgi?get_df=$thishost.$thisdate.$thissuite.summary\">summary</a>]"; - + print "\n"; } diff --git a/pan/reporter.h b/pan/reporter.h index ecc4ce14c..196fed16d 100644 --- a/pan/reporter.h +++ b/pan/reporter.h @@ -68,7 +68,7 @@ int test_end( SYM, SYM, SYM ); /* Scan Modes (above and beyond what I use lex for) */ #define SCAN_OUTSIDE 10 /* not in anything */ #define SCAN_RTSKEY 20 /* keywords: rts_keyword */ -#define SCAN_TSTKEY 21 /* keywords: either test_start or +#define SCAN_TSTKEY 21 /* keywords: either test_start or execution_status */ #define SCAN_OUTPUT 30 /* test_output */ diff --git a/pan/scan.l b/pan/scan.l index d8374f753..a7408606c 100644 --- a/pan/scan.l +++ b/pan/scan.l @@ -99,11 +99,11 @@ S [ \t]+ %Start KEY OUT CUTS %% -^<<<rts_keyword_start>>>$ { +^<<<rts_keyword_start>>>$ { BEGIN KEY; check_mode(scan_mode, SCAN_OUTSIDE, 0); scan_mode = SCAN_RTSKEY; - + /* remove any keys that exist right now */ if(keys != NULL) sym_rm(keys, RM_KEY | RM_DATA); @@ -130,12 +130,12 @@ S [ \t]+ sym_put(alltags, "_RTS", (void *)keys, PUT_REPLACE); keys = NULL; - - return(KW_END); + + return(KW_END); /* NOTREACHED */ } -^<<<test_start>>>$ { +^<<<test_start>>>$ { BEGIN KEY; check_mode(scan_mode, SCAN_OUTSIDE, 0); scan_mode = SCAN_TSTKEY; @@ -162,22 +162,22 @@ S [ \t]+ /* NOTREACHED */ } -^<<<test_output>>>$ { +^<<<test_output>>>$ { BEGIN OUT; check_mode(scan_mode, SCAN_TSTKEY, 0); scan_mode = SCAN_OUTPUT; - + test_output(ctag, keys); - - return(TEST_OUTPUT); + + return(TEST_OUTPUT); /* NOTREACHED */ } -^<<<execution_status>>>$ { +^<<<execution_status>>>$ { BEGIN KEY; check_mode(scan_mode, SCAN_TSTKEY, SCAN_OUTPUT, 0); scan_mode = SCAN_TSTKEY; - return(EXEC_STATUS); + return(EXEC_STATUS); /* NOTREACHED */ } @@ -214,7 +214,7 @@ S [ \t]+ printf("A quoted keyword: %s = %s\n", key, cont); #endif sym_put(keys, key, strdup(cont), 0); - + return(KEYWORD_QUOTED); /* NOTREACHED */ } @@ -228,8 +228,8 @@ S [ \t]+ printf("A keyword: %s = %s\n", key, cont); #endif sym_put(keys, key, strdup(cont), 0); - - return(KEYWORD); + + return(KEYWORD); /* NOTREACHED */ } @@ -238,24 +238,24 @@ S [ \t]+ /* NOTREACHED */ } -<OUT>^.+$ { +<OUT>^.+$ { #ifdef DEBUGGING DEBUG(D_SCAN_LEX, 5) printf("TEXT_LINE: %s\n", yytext); #endif - return(TEXT_LINE); + return(TEXT_LINE); /* NOTREACHED */ } -<CUTS>^{W}{S}{UI}{S}{A}{S}":" { +<CUTS>^{W}{S}{UI}{S}{A}{S}":" { #ifdef DEBUGGING DEBUG(D_SCAN_LEX, 5) printf("CUTS Result: %s\n", yytext); #endif cuts_testcase(ctag, keys); - return(CUTS_RESULT); + return(CUTS_RESULT); /* NOTREACHED */ } @@ -308,7 +308,7 @@ scanner(tags) /* * Test-Output record - * check if this is a CUTS test; if so, enter the lex "cuts" state; + * check if this is a CUTS test; if so, enter the lex "cuts" state; * otherwise do nothing and lex will be in a "data" mode that will just * toss all the output. */ @@ -317,7 +317,7 @@ test_output(tag, keys) SYM tag, keys; { char *at; - + if((at=(char *)sym_get(keys, "analysis")) != NULL) { /* CUTS:number_of_testcases || CUTS-1:number_of_testcases */ if(strncasecmp("cuts", at, 4) == 0) { @@ -331,7 +331,7 @@ test_output(tag, keys) /* Input Data State Check * RTS driver output goes thru specific * phases; this is used to verify that the new state is a legal state - * to change to from the current state. + * to change to from the current state. * This accepts a variable number of arguments (valid states to be * in). The last argument MUST be zero */ @@ -393,7 +393,7 @@ check_mode(int scan_mode, int fst, ...) /* * This part of the file contains subroutines called by a lex scanner which - * is parsing rts-driver-format input and putting it into a multi-level + * is parsing rts-driver-format input and putting it into a multi-level * symbol table. */ diff --git a/pan/symbol.h b/pan/symbol.h index 1a80ca280..b0d3bcb8f 100644 --- a/pan/symbol.h +++ b/pan/symbol.h @@ -48,7 +48,7 @@ struct sym { }; /* - * Symbol Table Header + * Symbol Table Header */ struct symh { int magic; @@ -63,7 +63,7 @@ typedef struct symh *SYM; /* * Data for keys and contents (lifted from dbopen(3)) - * dbopen(3) uses this for all functions, but I'm hard-wired into chars + * dbopen(3) uses this for all functions, but I'm hard-wired into chars * for keys and the like; I just need this for sym_get */ typedef struct { diff --git a/pan/zoolib.h b/pan/zoolib.h index 8b4049efe..678f0f204 100644 --- a/pan/zoolib.h +++ b/pan/zoolib.h @@ -56,14 +56,14 @@ void wait_handler(); * returns NULL on error */ char *zoo_getname(void); -/* zoo_open(): open a zoo file for use +/* zoo_open(): open a zoo file for use * returns NULL on error */ zoo_t zoo_open(char *zooname); /* zoo_close(): close an open zoo file */ int zoo_close(zoo_t z); -/* zoo_mark_cmdline(): make an entry to the zoo +/* zoo_mark_cmdline(): make an entry to the zoo * returns 0 on success, -1 on error */ int zoo_mark_cmdline(zoo_t z, pid_t p, char *tag, char *cmdline); |