4 files changed, 18 insertions, 6 deletions
diff --git a/unit-tests/export-env.exp b/unit-tests/export-env.exp
index 6221232a2a1b..8a779e6aff0a 100644
--- a/unit-tests/export-env.exp
+++ b/unit-tests/export-env.exp
@@ -2,8 +2,10 @@ make:
 UT_TEST=export-env.mk
 UT_ENV=not-exported
 UT_EXP=not-exported
+UT_LIT=literal export-env.mk
 env:
 UT_TEST=export-env.mk
 UT_ENV=exported
 UT_EXP=exported
+UT_LIT=literal ${UT_TEST}
 exit status 0
diff --git a/unit-tests/export-env.mk b/unit-tests/export-env.mk
index 6b7cd4c3060c..93aa6721a23e 100644
--- a/unit-tests/export-env.mk
+++ b/unit-tests/export-env.mk
@@ -1,4 +1,4 @@
-# $Id: export-env.mk,v 1.1.1.1 2014/08/30 18:57:18 sjg Exp $
+# $Id: export-env.mk,v 1.1.1.2 2016/02/18 20:35:24 sjg Exp $
 
 # our normal .export, subsequent changes affect the environment
 UT_TEST=this
@@ -15,9 +15,12 @@ UT_EXP=before-export
 export UT_EXP=exported
 UT_EXP=not-exported
 
+UT_LIT= literal ${UT_TEST}
+.export-literal UT_LIT
+
 all:
-	@echo make:; ${UT_TEST UT_ENV UT_EXP:L:@v@echo $v=${$v};@}
-	@echo env:; ${UT_TEST UT_ENV UT_EXP:L:@v@echo $v=$${$v};@}
+	@echo make:; ${UT_TEST UT_ENV UT_EXP UT_LIT:L:@v@echo $v=${$v};@}
+	@echo env:; ${UT_TEST UT_ENV UT_EXP UT_LIT:L:@v@echo $v=$${$v};@}
 
 
 
diff --git a/unit-tests/modts.exp b/unit-tests/modts.exp
index cf3c91d43c0c..338964963a86 100644
--- a/unit-tests/modts.exp
+++ b/unit-tests/modts.exp
@@ -23,10 +23,16 @@ THREE
 FOUR
 FIVE
 SIX"
+LIST:ts/xa:tu="ONE
+TWO
+THREE
+FOUR
+FIVE
+SIX"
 make: Bad modifier `:tx' for LIST
 LIST:tx="}"
-make: Bad modifier `:ts\x' for LIST
-LIST:ts/x:tu="\x:tu}"
+make: Bad modifier `:ts\X' for LIST
+LIST:ts/x:tu="\X:tu}"
 FU_mod-ts="a/b/cool"
 FU_mod-ts:ts:T="cool" == cool?
 B.${AAA:ts}="Baaa" == Baaa?
diff --git a/unit-tests/modts.mk b/unit-tests/modts.mk
index 54b3d3d2ffa1..e66dc25a2a02 100644
--- a/unit-tests/modts.mk
+++ b/unit-tests/modts.mk
@@ -36,8 +36,9 @@ mod-ts:
 	@${PRINT} 'LIST:ts/n="${LIST:ts\n}"'
 	@${PRINT} 'LIST:ts/t="${LIST:ts\t}"'
 	@${PRINT} 'LIST:ts/012:tu="${LIST:ts\012:tu}"'
+	@${PRINT} 'LIST:ts/xa:tu="${LIST:ts\xa:tu}"'
 	@${PRINT} 'LIST:tx="${LIST:tx}"'
-	@${PRINT} 'LIST:ts/x:tu="${LIST:ts\x:tu}"'
+	@${PRINT} 'LIST:ts/x:tu="${LIST:ts\X:tu}"'
 	@${PRINT} 'FU_$@="${FU_${@:ts}:ts}"'
 	@${PRINT} 'FU_$@:ts:T="${FU_${@:ts}:ts:T}" == cool?'
 	@${PRINT} 'B.$${AAA:ts}="${B.${AAA:ts}}" == Baaa?'