fix tests for TAO

mulle-nat · mulle-nat · commit 66ac8cd002e1 · 2024-12-11T17:54:01.000+01:00
diff --git a/.mulle/share/env/environment-plugin.sh b/.mulle/share/env/environment-plugin.sh
diff --git a/.mulle/share/env/version b/.mulle/share/env/version
diff --git a/.mulle/share/sde/version/mulle-sde/cmake b/.mulle/share/sde/version/mulle-sde/cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required( VERSION 3.14)
 
-project( mulle-objc-compat VERSION 0.21.0 LANGUAGES C)
+project( mulle-objc-compat VERSION 0.21.1 LANGUAGES C)
 
 
 # should be behind option but...
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ and familiarity.
 
 | Release Version                                       | Release Notes
 |-------------------------------------------------------|--------------
-| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-objc/mulle-objc-compat.svg?branch=release) [![Build Status](https://github.com/mulle-objc/mulle-objc-compat/workflows/CI/badge.svg?branch=release)](//github.com/mulle-objc/mulle-objc-compat/actions) | [RELEASENOTES](RELEASENOTES.md) |
+| ![Mulle kybernetiK tag](https://img.shields.io/github/tag/mulle-objc/mulle-objc-compat.svg) [![Build Status](https://github.com/mulle-objc/mulle-objc-compat/workflows/CI/badge.svg)](//github.com/mulle-objc/mulle-objc-compat/actions) | [RELEASENOTES](RELEASENOTES.md) |
 
 
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,3 +1,7 @@
+### 0.21.1
+
+Various small improvements
+
 ## 0.21.0
 
 
diff --git a/cmake/share/InstallRpath.cmake b/cmake/share/InstallRpath.cmake
diff --git a/src/mulle-objc-compat.h b/src/mulle-objc-compat.h
@@ -5,7 +5,7 @@
  *
  *  version:  major, minor, patch
  */
-#define MULLE_OBJC_COMPAT_VERSION  ((0UL << 20) | (21 << 8) | 0)
+#define MULLE_OBJC_COMPAT_VERSION  ((0UL << 20) | (21 << 8) | 1)
 
 #include "runtime.h"
 #include "method.h"
diff --git a/test/.mulle/share/env/environment-plugin.sh b/test/.mulle/share/env/environment-plugin.sh
@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'
 #
 #
 #
-export MULLE_SDE_INSTALLED_VERSION="3.2.0"
+export MULLE_SDE_INSTALLED_VERSION="3.2.2"
 
 
diff --git a/test/.mulle/share/env/version b/test/.mulle/share/env/version
@@ -1 +1 @@
-5.3.0
+5.3.1
diff --git a/test/.mulle/share/sde/version/mulle-sde/base-test-runtime b/test/.mulle/share/sde/version/mulle-sde/base-test-runtime
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/.mulle/share/sde/version/mulle-sde/c-test-runtime b/test/.mulle/share/sde/version/mulle-sde/c-test-runtime
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/.mulle/share/sde/version/mulle-sde/objc-test b/test/.mulle/share/sde/version/mulle-sde/objc-test
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime b/test/.mulle/share/sde/version/mulle-sde/objc-test-runtime
@@ -1 +1 @@
-6.4.0
+6.4.2
diff --git a/test/run-test b/test/run-test
@@ -60,10 +60,10 @@ EOF
 
 main()
 {
-   local flags
    local configuration
+   local releaseflags="-O3 -g -fno-objc-tao -DNDEBUG -DMULLE_TEST"
+   local debugflags="-O0 -g -fobjc-tao -DMULLE_TEST"
 
-   flags="-O0 -g -DMULLE_TEST"
    configuration="Debug"
 
    while [ $# -ne 0 ]
@@ -84,12 +84,10 @@ main()
          ;;
 
          --release)
-            flags="-O3 -g -DNDEBUG -DMULLE_TEST"
             configuration="Release"
          ;;
 
          --debug)
-            flags="-O0 -g -DMULLE_TEST"
             configuration="Debug"
          ;;
 
@@ -118,7 +116,6 @@ main()
    local dependencydir
    local rootdir
 
-
    rootdir="${PWD}"
    dependencydir="`mulle-sde dependency-dir`" || exit 1
 
@@ -151,6 +148,15 @@ main()
 
    shell_enable_nullglob
 
+   local flags
+
+   flags="${debugflags}"
+   case "${configuration}" in
+      *[Rr]elease*)
+         flags="${releaseflags}"
+      ;;
+   esac
+
    #
    # MEMO not sure why we do it so strangely here with the 6-9
    #

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* version: major, minor, patch`
`7`	`7`	`*/`
`8`		`-#define MULLE_OBJC_COMPAT_VERSION ((0UL << 20) \| (21 << 8) \| 0)`
	`8`	`+#define MULLE_OBJC_COMPAT_VERSION ((0UL << 20) \| (21 << 8) \| 1)`
`9`	`9`
`10`	`10`	`#include "runtime.h"`
`11`	`11`	`#include "method.h"`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ export MULLE_SOURCETREE_SYMLINK='YES'`
`22`	`22`	`#`
`23`	`23`	`#`
`24`	`24`	`#`
`25`		`-export MULLE_SDE_INSTALLED_VERSION="3.2.0"`
	`25`	`+export MULLE_SDE_INSTALLED_VERSION="3.2.2"`
`26`	`26`
`27`	`27`