Revert revision 19411 as the feature was implemented not as discussed on core.

git-svn-id: branches/svenbarth/misc@19696 -

tests/utils/digest.pp

@@ -36,7 +36,6 @@ const
   skipping_other_target_count : longint = 0;
   skipping_run_unit_count : longint = 0;
   skipping_run_test_count : longint = 0;
-  skipping_unconditionally_count : longint = 0;
   unknown_lines : longint = 0;
   unexpected_run : longint = 0;
   next_should_be_run : boolean = false;
@@ -117,10 +116,6 @@ begin
     begin
       inc(skipping_other_cpu_count);
     end
-  else if pos(skipping_test,st)=1 then
-    begin
-      inc(skipping_unconditionally_count);
-    end
   else if pos(skipping_other_target,st)=1 then
     begin
       inc(skipping_other_target_count);
@@ -195,13 +190,11 @@ begin
     +skipping_known_bug_count
     +skipping_other_version_count
     +skipping_other_cpu_count
-    +skipping_other_target_count
-    +skipping_unconditionally_count;
+    +skipping_other_target_count;
   { don't count these ones ...
     skipping_run_unit_count
     skipping_run_test_count }
   Writeln('Number of skipped tests = ',number_skipped);
-  Writeln('Number of unconditionally skipped tests = ',skipping_unconditionally_count);
   Writeln('Number of skipped graph tests = ',skipping_graph_test_count);
   Writeln('Number of skipped interactive tests = ',skipping_interactive_test_count);
   Writeln('Number of skipped known bug tests = ',skipping_known_bug_count);

tests/utils/dotest.pp

@@ -1490,18 +1490,6 @@ begin
       Verbose(V_Debug,'Using Execution logfile: '+ExeLogFile);
     end;
 
-  if Res then
-   begin
-     if Config.Skip and not DoAll then
-      begin
-        AddLog(ResLogFile,skipping_test+PPFileInfo[current]);
-        { avoid a second attempt by writing to elg file }
-        AddLog(EXELogFile,skipping_test+PPFileInfo[current]);
-        Verbose(V_Warning,skipping_test);
-        Res:=false;
-      end;
-   end;
-
   if Res then
    begin
      if Config.UsesGraph and (not DoGraph) then

tests/utils/tests.sql

@@ -65,7 +65,6 @@ CREATE TABLE TESTRUN (
   TU_SUBMITTER varchar(128) NOT NULL default '',
   TU_MACHINE varchar(128) NOT NULL default '',
   TU_COMMENT varchar(255) NOT NULL default '',
-  TU_SKIPPEDUNCONDITIONALLY int(11) NOT NULL default '0',
   PRIMARY KEY  (TU_ID),
   UNIQUE KEY TU_OVERVIEW (TU_ID,TU_CPU_FK,TU_OS_FK,TU_VERSION_FK,TU_DATE),
   KEY TU_IDATE (TU_DATE)

tests/utils/teststr.pp

@@ -26,7 +26,6 @@ const
   successfully_compiled = 'Successfully compiled ';
   failed_to_run = 'Failed to run ';
   successfully_run = 'Successfully run ';
-  skipping_test = 'Unconditionally skipping test ';
   skipping_graph_test = 'Skipping test because it uses graph ';
   skipping_interactive_test = 'Skipping test because it is interactive ';
   skipping_known_bug = 'Skipping test because it is a known bug ';

tests/utils/testu.pp

@@ -41,7 +41,6 @@ type
     Files         : string;
     WpoParas      : string;
     WpoPasses     : longint;
-    Skip          : boolean;
   end;
 
 Const
@@ -277,9 +276,6 @@ begin
                 if GetEntry('WPOPASSES') then
                  val(res,r.wpopasses,code)
               else
-                if GetEntry('SKIP') then
-                 r.Skip:=true
-              else 
                Verbose(V_Error,'Unknown entry: '+s);
             end;
          end

tests/utils/tresults.pp

@@ -42,14 +42,13 @@ Type
   stSkippingOtherCpu,
   stSkippingOtherTarget,
   stskippingRunUnit,
-  stskippingRunTest,
-  stskippungUnconditionally
+  stskippingRunTest
   );
 
 
 Const
   FirstStatus = stFailedToCompile;
-  LastStatus = stskippingUnconditionally;
+  LastStatus = stskippingRunTest;
 
   TestOK : Array[TTestStatus] of Boolean = (
     False, // stFailedToCompile,
@@ -67,8 +66,7 @@ Const
     False, // stSkippingOtherCpu,
     False, // stSkippingOtherTarget,
     False, // stskippingRunUnit,
-    False, // stskippingRunTest,
-    False  // stskippingUnconditionally
+    False  // stskippingRunTest
   );
 
   TestSkipped : Array[TTestStatus] of Boolean = (
@@ -87,8 +85,7 @@ Const
     True,   // stSkippingOtherCpu,
     True,   // stSkippingOtherTarget,
     True,   // stskippingRunUnit,
-    True,   // stskippingRunTest,
-    True    // stskippingUnconditionally
+    True    // stskippingRunTest
   );
 
   ExpectRun : Array[TTestStatus] of Boolean = (
@@ -107,8 +104,7 @@ Const
     False,  // stSkippingOtherCpu,
     False,  // stSkippingOtherTarget,
     False,  // stskippingRunUnit,
-    False,  // stskippingRunTest,
-    False,  // stskippingUnconditionally
+    False   // stskippingRunTest
    );
 
   StatusText : Array[TTestStatus] of String = (
@@ -127,8 +123,7 @@ Const
     skipping_other_cpu ,
     skipping_other_target ,
     skipping_run_unit ,
-    skipping_run_test ,
-    skipping_test
+    skipping_run_test
   );
 
   SQLField : Array[TTestStatus] of String = (
@@ -147,8 +142,7 @@ Const
     'TU_OTHERCPU',
     'TU_OTHERTARGET',
     'TU_UNIT',
-    'TU_SKIPPINGRUNTEST',
-    'TU_SKIPPEDUNCONDITIONALLY'
+    'TU_SKIPPINGRUNTEST'
   );