Add fixes for keil51 rules to pass the tests

diff --git a/snippets/keil51.omk b/snippets/keil51.omk
index 8eae753cf8393726f56a4d9257484d2ce86e4eaf..80e02346ba35f6988901234e3243a446faabd320 100644 (file)
--- a/snippets/keil51.omk
+++ b/snippets/keil51.omk
@@ -169,3 +169,9 @@ $(USER_LIB_DIR)/$(LIB_PREF)$(1)$(LIB_EXT): $$($(1)_OBJS)
        for i in $$^ ; do $(AR) ADD $$$$i TO $$@ ; done
        @touch $(USER_LIB_DIR)/timestamp
 endef
+
+# Hack: Unfortunately, USER_LIB_DIR is set later and the rule below would not work.
+USER_LIB_DIR := $(MAKERULES_DIR)/_compiled/lib
+
+$(USER_LIB_DIR)/timestamp:
+       $(Q)touch $@

diff --git a/tests/wvtest.sh b/tests/wvtest.sh
index 2a8d1d56066e8a5c5d4d82cf6beb280ae0b84a24..7b286c4e917c5bc599e5bb33cda75cd2efdd88b6 100644 (file)
--- a/tests/wvtest.sh
+++ b/tests/wvtest.sh
@@ -154,6 +154,11 @@ needs_valid_CC()
        echo "Warning: cygpath command not found - skipping the test"
        exit 0
     fi
+
+    if [[ $OMK_RULES = sysless-keil51 ]] && ! which l51; then
+       echo "Warning: l51 command not found - skipping the test"
+       exit 0
+    fi
 }
 
 OMK_TESTSROOT=${OMK_TESTSROOT:-$(readlink --canonicalize $(dirname $0))}