svn commit: r260453 - in user/jmmv/autotest/node: . configs configs/kyua1 configs/kyua2

[Julio Merino]

Author: jmmv
Date: Wed Jan  8 17:16:24 2014
New Revision: 260453
URL: http://svnweb.freebsd.org/changeset/base/260453

Log:
  Add configs to run i386 tests.
  
  This shards the config files into per-machine directories.  kyua1 is left
  to run amd64 tests and kyua2 to run i386 tests, for now at least.

Added:
  user/jmmv/autotest/node/configs/kyua1/
  user/jmmv/autotest/node/configs/kyua1/head.conf
     - copied, changed from r260450, user/jmmv/autotest/node/configs/head.conf
  user/jmmv/autotest/node/configs/kyua1/stable-10.conf
     - copied, changed from r260450, user/jmmv/autotest/node/configs/stable-10.conf
  user/jmmv/autotest/node/configs/kyua2/
  user/jmmv/autotest/node/configs/kyua2/head.conf
     - copied, changed from r260450, user/jmmv/autotest/node/configs/head.conf
  user/jmmv/autotest/node/configs/kyua2/stable-10.conf
     - copied, changed from r260450, user/jmmv/autotest/node/configs/stable-10.conf
Deleted:
  user/jmmv/autotest/node/configs/head.conf
  user/jmmv/autotest/node/configs/stable-10.conf
Modified:
  user/jmmv/autotest/node/Makefile

Modified: user/jmmv/autotest/node/Makefile
==============================================================================
--- user/jmmv/autotest/node/Makefile	Wed Jan  8 17:06:11 2014	(r260452)
+++ user/jmmv/autotest/node/Makefile	Wed Jan  8 17:16:24 2014	(r260453)
@@ -6,7 +6,8 @@ SHTK?= shtk
 BINDIR= ${.CURDIR}
 LOCALSTATEDIR= /var
 SHELL= /bin/sh
-SYSCONFDIR= ${.CURDIR}/configs
+CONFIGS_SUBDIR!= hostname -s
+SYSCONFDIR= ${.CURDIR}/configs/${CONFIGS_SUBDIR}
 
 SCRIPTS= iterate loop
 

Copied and modified: user/jmmv/autotest/node/configs/kyua1/head.conf (from r260450, user/jmmv/autotest/node/configs/head.conf)
==============================================================================
--- user/jmmv/autotest/node/configs/head.conf	Wed Jan  8 14:42:26 2014	(r260450, copy source)
+++ user/jmmv/autotest/node/configs/kyua1/head.conf	Wed Jan  8 17:16:24 2014	(r260453)
@@ -11,6 +11,9 @@ DATADIR="${root}/data"
 SRCBRANCH="base/head"
 MKVARS="NO_CLEAN=yes WITH_TESTS=yes"
 
+TARGET=amd64
+TARGET_ARCH=amd64
+
 # TODO(jmmv): Remove this.  lib32 builds are currently broken in combination
 # with the test suite, so we ought to fix that instead of disabling lib32.
 MKVARS="${MKVARS} WITHOUT_LIB32=yes"

Copied and modified: user/jmmv/autotest/node/configs/kyua1/stable-10.conf (from r260450, user/jmmv/autotest/node/configs/stable-10.conf)
==============================================================================
--- user/jmmv/autotest/node/configs/stable-10.conf	Wed Jan  8 14:42:26 2014	(r260450, copy source)
+++ user/jmmv/autotest/node/configs/kyua1/stable-10.conf	Wed Jan  8 17:16:24 2014	(r260453)
@@ -11,6 +11,9 @@ DATADIR="${root}/data"
 SRCBRANCH="base/stable/10"
 MKVARS="NO_CLEAN=yes WITH_TESTS=yes"
 
+TARGET=amd64
+TARGET_ARCH=amd64
+
 # TODO(jmmv): Remove this.  lib32 builds are currently broken in combination
 # with the test suite, so we ought to fix that instead of disabling lib32.
 MKVARS="${MKVARS} WITHOUT_LIB32=yes"

Copied and modified: user/jmmv/autotest/node/configs/kyua2/head.conf (from r260450, user/jmmv/autotest/node/configs/head.conf)
==============================================================================
--- user/jmmv/autotest/node/configs/head.conf	Wed Jan  8 14:42:26 2014	(r260450, copy source)
+++ user/jmmv/autotest/node/configs/kyua2/head.conf	Wed Jan  8 17:16:24 2014	(r260453)
@@ -11,6 +11,9 @@ DATADIR="${root}/data"
 SRCBRANCH="base/head"
 MKVARS="NO_CLEAN=yes WITH_TESTS=yes"
 
+TARGET=i386
+TARGET_ARCH=i386
+
 # TODO(jmmv): Remove this.  lib32 builds are currently broken in combination
 # with the test suite, so we ought to fix that instead of disabling lib32.
 MKVARS="${MKVARS} WITHOUT_LIB32=yes"

Copied and modified: user/jmmv/autotest/node/configs/kyua2/stable-10.conf (from r260450, user/jmmv/autotest/node/configs/stable-10.conf)
==============================================================================
--- user/jmmv/autotest/node/configs/stable-10.conf	Wed Jan  8 14:42:26 2014	(r260450, copy source)
+++ user/jmmv/autotest/node/configs/kyua2/stable-10.conf	Wed Jan  8 17:16:24 2014	(r260453)
@@ -11,6 +11,9 @@ DATADIR="${root}/data"
 SRCBRANCH="base/stable/10"
 MKVARS="NO_CLEAN=yes WITH_TESTS=yes"
 
+TARGET=i386
+TARGET_ARCH=i386
+
 # TODO(jmmv): Remove this.  lib32 builds are currently broken in combination
 # with the test suite, so we ought to fix that instead of disabling lib32.
 MKVARS="${MKVARS} WITHOUT_LIB32=yes"