--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/make/TestMakeBase.gmk	Sun Aug 17 15:51:37 2014 +0100
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+THIS_FILE := $(SRC_ROOT)/test/make/TestMakeBase.gmk
+DEPS := $(THIS_FILE) \
+    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    #
+
+OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/make-base
+
+################################################################################
+# Escape $
+ifneq ($(call EscapeDollar, foo$$bar), foo\$$bar)
+  $(error EscapeDollar failed $(call EscapeDollar, foo$$bar) foo\$$bar)
+endif
+
+ESCAPE_DOLLAR_DIR := $(OUTPUT_DIR)/escape-dollar
+
+$(ESCAPE_DOLLAR_DIR)/_escape_dollar: $(DEPS)
+	$(RM) -r $(@D)
+	$(MKDIR) -p $(@D)
+	$(ECHO) foo\$$bar > $(@D)/file1
+	$(ECHO) $(call EscapeDollar, foo$$bar) > $(@D)/file2
+	$(ECHO) $(call EscapeDollar, foo\$$bar) > $(@D)/file3
+	$(DIFF) $(@D)/file1 $(@D)/file2
+	$(DIFF) $(@D)/file1 $(@D)/file3
+	$(TOUCH) $@
+
+TEST_TARGETS += $(ESCAPE_DOLLAR_DIR)/_escape_dollar
+
+################################################################################
+
+all: $(TEST_TARGETS)