diff options
| author | sjg <sjg@FreeBSD.org> | 2016-03-11 01:35:39 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2016-03-11 01:35:39 +0000 |
| commit | 218c7825feaddeda53ec3130ebb13f0aa74393a3 (patch) | |
| tree | 1eefb1aee77f4268ae920b1f416feefde0a0000d /contrib/bmake/unit-tests | |
| parent | ba453f42f3c1044974096e29cb9098cb78db20e5 (diff) | |
| download | FreeBSD-src-218c7825feaddeda53ec3130ebb13f0aa74393a3.zip FreeBSD-src-218c7825feaddeda53ec3130ebb13f0aa74393a3.tar.gz | |
Merge bmake-20160307
Diffstat (limited to 'contrib/bmake/unit-tests')
| -rw-r--r-- | contrib/bmake/unit-tests/export-env.exp | 2 | ||||
| -rw-r--r-- | contrib/bmake/unit-tests/export-env.mk | 9 | ||||
| -rw-r--r-- | contrib/bmake/unit-tests/modts.exp | 10 | ||||
| -rw-r--r-- | contrib/bmake/unit-tests/modts.mk | 3 |
4 files changed, 18 insertions, 6 deletions
diff --git a/contrib/bmake/unit-tests/export-env.exp b/contrib/bmake/unit-tests/export-env.exp index 6221232..8a779e6 100644 --- a/contrib/bmake/unit-tests/export-env.exp +++ b/contrib/bmake/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/contrib/bmake/unit-tests/export-env.mk b/contrib/bmake/unit-tests/export-env.mk index 6b7cd4c..93aa672 100644 --- a/contrib/bmake/unit-tests/export-env.mk +++ b/contrib/bmake/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/contrib/bmake/unit-tests/modts.exp b/contrib/bmake/unit-tests/modts.exp index cf3c91d..3389649 100644 --- a/contrib/bmake/unit-tests/modts.exp +++ b/contrib/bmake/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/contrib/bmake/unit-tests/modts.mk b/contrib/bmake/unit-tests/modts.mk index 54b3d3d..e66dc25 100644 --- a/contrib/bmake/unit-tests/modts.mk +++ b/contrib/bmake/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?' |
