Reworked default-config test

diff --git a/tests/default-config b/tests/default-config
index 39656d289166ca02b8a7e463a7e391fa5f8702bb..f5eacf7efd3d41bb5329f32f2d08fdb5abe752c4 100755 (executable)
--- a/tests/default-config
+++ b/tests/default-config
@@ -1,6 +1,31 @@
 #!/bin/bash
 
-. ./functions.sh
+. ./wvtest.sh
 
+cat > 'Makefile.omk' <<EOF     # This file is included into OMK manual
+default_CONFIG = CONFIG_DEBUG=y CONFIG_SLOW=n
+default_CONFIG += CONFIG_NUM=123 CONFIG_ARCH=arm
+default_CONFIG += CONFIG_QUOTES="Text+quotes"
+
+SUBDIRS=subdir
+EOF
+cat > 'config.omk-correct' <<EOF
+# Start of OMK config file
+# This file should not be altered manually
+# Overrides should be stored in file config.omk
+
+# Config for subdir
+CONFIG_SUBDIR=y
+#CONFIG_DEBUG=x
+# Config for 
+CONFIG_DEBUG=y
+CONFIG_SLOW=n
+CONFIG_NUM=123
+CONFIG_ARCH=arm
+CONFIG_QUOTES="Text+quotes"
+EOF
+mkdir 'subdir'
+echo 'default_CONFIG = CONFIG_SUBDIR=y CONFIG_DEBUG=x' > 'subdir/Makefile.omk'
+omkize
 WVPASS make
 WVPASS diff -u config.omk-correct config.omk-default

diff --git a/tests/default-config.files b/tests/default-config.files
deleted file mode 100644 (file)
index 72d41b7..0000000
--- a/tests/default-config.files
+++ /dev/null
@@ -1,24 +0,0 @@
-cat > 'Makefile.omk' <<EOF
-default_CONFIG = CONFIG_DEBUG=y CONFIG_SLOW=n
-default_CONFIG += CONFIG_NUM=123 CONFIG_ARCH=arm
-default_CONFIG += CONFIG_QUOTES="Text+quotes"
-
-SUBDIRS=subdir
-EOF
-cat > 'config.omk-correct' <<EOF
-# Start of OMK config file
-# This file should not be altered manually
-# Overrides should be stored in file config.omk
-
-# Config for subdir
-CONFIG_SUBDIR=y
-#CONFIG_DEBUG=x
-# Config for 
-CONFIG_DEBUG=y
-CONFIG_SLOW=n
-CONFIG_NUM=123
-CONFIG_ARCH=arm
-CONFIG_QUOTES="Text+quotes"
-EOF
-mkdir 'subdir'
-echo 'default_CONFIG = CONFIG_SUBDIR=y CONFIG_DEBUG=x' > 'subdir/Makefile.omk'