From 619ee46ac6284add7eee989cc69be9260385519c Mon Sep 17 00:00:00 2001 From: Brian Wellington Date: Fri, 12 Jan 2001 22:14:59 +0000 Subject: [PATCH] Copy cache.in to cache before running the test, so it's not overwritten on exit. --- bin/tests/system/glue/clean.sh | 6 ++---- bin/tests/system/glue/ns1/.cvsignore | 1 + bin/tests/system/glue/ns1/{cache => cache.in} | 2 +- bin/tests/system/glue/setup.sh | 20 +++++++++++++++++++ 4 files changed, 24 insertions(+), 5 deletions(-) rename bin/tests/system/glue/ns1/{cache => cache.in} (94%) create mode 100644 bin/tests/system/glue/setup.sh diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh index 9a9aa4170b..1483924500 100644 --- a/bin/tests/system/glue/clean.sh +++ b/bin/tests/system/glue/clean.sh @@ -15,12 +15,10 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: clean.sh,v 1.4 2001/01/09 21:43:17 bwelling Exp $ +# $Id: clean.sh,v 1.5 2001/01/12 22:14:55 bwelling Exp $ # # Clean up after glue tests. # -rm -f dig.out - - +rm -f dig.out ns1/cache diff --git a/bin/tests/system/glue/ns1/.cvsignore b/bin/tests/system/glue/ns1/.cvsignore index 6af68aad15..9e0814c5fd 100644 --- a/bin/tests/system/glue/ns1/.cvsignore +++ b/bin/tests/system/glue/ns1/.cvsignore @@ -1 +1,2 @@ named.run +cache diff --git a/bin/tests/system/glue/ns1/cache b/bin/tests/system/glue/ns1/cache.in similarity index 94% rename from bin/tests/system/glue/ns1/cache rename to bin/tests/system/glue/ns1/cache.in index 6e7b7e6a90..87413df959 100644 --- a/bin/tests/system/glue/ns1/cache +++ b/bin/tests/system/glue/ns1/cache.in @@ -13,7 +13,7 @@ ; NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION ; WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -; $Id: cache,v 1.4 2001/01/09 21:43:20 bwelling Exp $ +; $Id: cache.in,v 1.1 2001/01/12 22:14:59 bwelling Exp $ ; Preloaded cache data for glue test diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh new file mode 100644 index 0000000000..e1e947bf37 --- /dev/null +++ b/bin/tests/system/glue/setup.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (C) 2000, 2001 Internet Software Consortium. +# +# Permission to use, copy, modify, and distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM +# DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +# INTERNET SOFTWARE CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, +# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING +# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +# $Id: setup.sh,v 1.1 2001/01/12 22:14:56 bwelling Exp $ + +cd ns1 && cp cache.in cache