Merge 6fdd259 into 0f1199c

polserver · Feb 28, 2021 · 4b04178 · 4b04178
2 parents 0f1199c + 6fdd259
commit 4b04178
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/cmake/escripttest.cmake b/cmake/escripttest.cmake
@@ -61,7 +61,7 @@ function (compareresult scriptname result)
       endif()
     endforeach()
   else()
-    message("\"${tst}\"")
+    message("\"${tstcontent}\"")
     message(SEND_ERROR "Testdata length differs")
     cleanup(${scriptname})
   endif()

diff --git a/testsuite/pol/scripts/include/sysevent.inc b/testsuite/pol/scripts/include/sysevent.inc
@@ -5,7 +5,7 @@
 // See documentation for details.
 //
 // DO NOT MODIFY THIS FILE!  These are system events.  New core distributions
-// will include new versions of this file.  User events should be placed in 
+// will include new versions of this file.  User events should be placed in
 // eventid.inc, and must have more than one bit set (ie not be any of the
 // values found in this file)
 //
@@ -22,8 +22,6 @@ const SYSEVENT_DAMAGED              := 0x00000008;
 const SYSEVENT_ENTEREDAREA          := 0x00000010;
 const SYSEVENT_LEFTAREA             := 0x00000020;
 
-const SYSEVENT_GONE_CRIMINAL        := 0x2000;
-
 const SYSEVENT_OPPONENT_MOVED       := 0x00000040;
 
 const SYSEVENT_HOSTILE_MOVED        := 0x00000080; // not implemented
@@ -36,9 +34,9 @@ const SYSEVENT_ITEM_GIVEN           := 0x00000400;
 const SYSEVENT_DOUBLECLICKED        := 0x00000800;
 
 const SYSEVENT_GHOST_SPEECH         := 0x00001000;
-const SYSEVENT_RESERVED_00002000    := 0x00002000;
-const SYSEVENT_RESERVED_00004000    := 0x00004000;
-const SYSEVENT_RESERVED_00008000    := 0x00008000;
+const SYSEVENT_GONE_CRIMINAL        := 0x00002000;
+const SYSEVENT_TOKEN_SPEECH         := 0x00004000;
+const SYSEVENT_TOKEN_GHOST_SPEECH   := 0x00008000;
 
 const SYSEVENT_RESERVED_00010000    := 0x00010000;
 const SYSEVENT_RESERVED_00020000    := 0x00020000;
@@ -55,4 +53,4 @@ const SYSEVENT_RESERVED_08000000    := 0x08000000;
 const SYSEVENT_RESERVED_10000000    := 0x10000000;
 const SYSEVENT_RESERVED_20000000    := 0x20000000;
 const SYSEVENT_RESERVED_40000000    := 0x40000000;
-const SYSEVENT_RESERVED_80000000    := 0x80000000;
+const SYSEVENT_RESERVED_80000000    := 0x80000000;
diff --git a/testsuite/pol/scripts/tests.src b/testsuite/pol/scripts/tests.src
@@ -12,12 +12,21 @@ program tests()
     + "##########################\n",0);
   var exitcode:=0;
   var testpkgs:={};
+  var restartpkg;
   foreach pkg in Packages()
     if (pkg.dir.find("testpkgs")==1)
-      testpkgs.append({pkg.name,pkg.desc});
+      if (pkg.name == "testrestart")
+        restartpkg:={pkg.name,pkg.desc};
+      else
+        testpkgs.append({pkg.name,pkg.desc});
+      endif
     endif
   endforeach
   testpkgs.sort(1);
+  // to prevent cleanup of other tests, TestRestart always at the end
+  if (restartpkg)
+    testpkgs.append(restartpkg);
+  endif
 
   var filter:=GetEnvironmentVariable("POLCORE_TEST_FILTER");
   if (filter)