Move old tests to old-tests/

35 files changed, 0 insertions, 918 deletions

diff --git a/tests/variable/dir-path/buildfile b/tests/variable/dir-path/buildfile
deleted file mode 100644
index 5c99f07..0000000
--- a/tests/variable/dir-path/buildfile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Untyped dir path reversability.
-#
-x = s/foo/bar/
-print -e=$x
-print -e $x
-
-y = $x
-print -e=$y
-print -e $y
-print
-
-# Typed dir path reversability and expansion.
-#
-x = [dir_path] foo/bar/
-print -I$x
-print -I$x/baz
-print -I $x
-print [strings] -I $x
-print -I $x/baz
-print
-
-y = $x             # No longer typed but still not original.
-print -I$y
-print -I$y/baz
-print -I $y
-print [strings] -I $y
-print -I $y/baz
-print
-
-z = [strings] $x   # Re-typed.
-print $z
-print
-
-# The root case.
-#
-r = [dir_path] /
-print $r/foo
-
-r += foo
-print [strings] $r
-
-r += bar
-print [strings] $r
-
-./:
diff --git a/tests/variable/dir-path/test.out b/tests/variable/dir-path/test.out
deleted file mode 100644
index e608c42..0000000
--- a/tests/variable/dir-path/test.out
+++ /dev/null
@@ -1,22 +0,0 @@
--e=s/foo/bar/
--e s/foo/bar/
--e=s/foo/bar/
--e s/foo/bar/
-
--Ifoo/bar
--Ifoo/bar/baz
--I foo/bar/
--I foo/bar
--I foo/bar/baz
-
--Ifoo/bar
--Ifoo/bar/baz
--I foo/bar/
--I foo/bar
--I foo/bar/baz
-
-foo/bar
-
-//foo
-/foo
-/foo/bar
diff --git a/tests/variable/dir-path/test.sh b/tests/variable/dir-path/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/dir-path/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/expansion/buildfile b/tests/variable/expansion/buildfile
deleted file mode 100644
index 3f28372..0000000
--- a/tests/variable/expansion/buildfile
+++ /dev/null
@@ -1,26 +0,0 @@
-foo = FOO
-
-print $foo
-print $(foo)
-
-# Invalid.
-#
-#print $
-#print $()
-#print $(foo bar)
-#print $(foo{bar})
-
-# Indirect.
-#
-FOO = foo
-print $($FOO)
-print $($(FOO))
-print $($($FOO))
-
-# Quoted name.
-#
-"b a r" = BAR
-print $("b a r")
-#print $"b a r"
-
-./:
diff --git a/tests/variable/expansion/test.out b/tests/variable/expansion/test.out
deleted file mode 100644
index 5056f04..0000000
--- a/tests/variable/expansion/test.out
+++ /dev/null
@@ -1,6 +0,0 @@
-FOO
-FOO
-FOO
-FOO
-foo
-BAR
diff --git a/tests/variable/expansion/test.sh b/tests/variable/expansion/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/expansion/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/null/buildfile b/tests/variable/null/buildfile
deleted file mode 100644
index 3fa1a9e..0000000
--- a/tests/variable/null/buildfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#v = [null=junk]  # error: unexpected value for attribute null: junk
-#v = [null] junk  # error: empty null value expected instead of 'junk'
-
-print $v0 # Undefined.
-
-v1 = [null]
-print $v1
-
-v2 = x
-v2 = [null]
-print $v2
-
-v3a = [null]
-v3b = $v3a
-print $v3b
-v3b = ($v3a)
-print $v3b
-print ($v3b)
-
-print [null]
-
-./:
diff --git a/tests/variable/null/test.out b/tests/variable/null/test.out
deleted file mode 100644
index 5119a71..0000000
--- a/tests/variable/null/test.out
+++ /dev/null
@@ -1,7 +0,0 @@
-[null]
-[null]
-[null]
-[null]
-[null]
-[null]
-[null]
diff --git a/tests/variable/null/test.sh b/tests/variable/null/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/null/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/override/build/bootstrap.build b/tests/variable/override/build/bootstrap.build
deleted file mode 100644
index 1c2e239..0000000
--- a/tests/variable/override/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = override
-amalgamation = # Disabled.
diff --git a/tests/variable/override/buildfile b/tests/variable/override/buildfile
deleted file mode 100644
index c090e81..0000000
--- a/tests/variable/override/buildfile
+++ /dev/null
@@ -1,58 +0,0 @@
-if ($t != [null])
-{
-  [$t] v = [null]
-}
-
-print "/     :" $(/: v)
-
-if ($a == as)
-{
-  v = x
-}
-elif ($a == ap)
-{
-  v += s
-}
-elif ($a == pr)
-{
-  v =+ p
-}
-
-print ".     :" $v
-
-d/:
-{
-  if ($d_a == as)
-  {
-    v = x
-  }
-  elif ($d_a == ap)
-  {
-    v += s
-  }
-  elif ($d_a == pr)
-  {
-    v =+ p
-  }
-
-  print "d     :" $v
-
-
-  if ($d_t_a == as)
-  {
-    file{t}: v = x
-  }
-  elif ($d_t_a == ap)
-  {
-    file{t}: v += s
-  }
-  elif ($d_t_a == pr)
-  {
-    file{t}: v =+ p
-  }
-
-  print "d/t   :" $(file{t}: v)
-}
-
-include p/
-./:
diff --git a/tests/variable/override/cache b/tests/variable/override/cache
deleted file mode 100644
index 8378688..0000000
--- a/tests/variable/override/cache
+++ /dev/null
@@ -1,13 +0,0 @@
-x = [string] 0
-print $x
-
-x = [uint64] 1
-print $x
-
-y = 0
-print $y
-
-[uint64] y = [null]
-print $y
-
-./:
diff --git a/tests/variable/override/p/build/bootstrap.build b/tests/variable/override/p/build/bootstrap.build
deleted file mode 100644
index 723e2a3..0000000
--- a/tests/variable/override/p/build/bootstrap.build
+++ /dev/null
@@ -1 +0,0 @@
-project = override-p
diff --git a/tests/variable/override/p/buildfile b/tests/variable/override/p/buildfile
deleted file mode 100644
index 527b9ae..0000000
--- a/tests/variable/override/p/buildfile
+++ /dev/null
@@ -1,49 +0,0 @@
-if ($p_a == as)
-{
-  v = x
-}
-elif ($p_a == ap)
-{
-  v += s
-}
-elif ($p_a == pr)
-{
-  v =+ p
-}
-
-print "p     :" $v
-
-d/:
-{
-  if ($p_d_a == as)
-  {
-    v = x
-  }
-  elif ($p_d_a == ap)
-  {
-    v += s
-  }
-  elif ($p_d_a == pr)
-  {
-    v =+ p
-  }
-
-  print "p/d   :" $v
-
-  if ($p_d_t_a == as)
-  {
-    file{t}: v = x
-  }
-  elif ($p_d_t_a == ap)
-  {
-    file{t}: v += s
-  }
-  elif ($p_d_t_a == pr)
-  {
-    file{t}: v =+ p
-  }
-
-  print "p/d/t :" $(file{t}: v)
-}
-
-./:
diff --git a/tests/variable/override/p/loader b/tests/variable/override/p/loader
deleted file mode 100644
index f298dcc..0000000
--- a/tests/variable/override/p/loader
+++ /dev/null
@@ -1 +0,0 @@
-include ../buildfile
diff --git a/tests/variable/override/simple b/tests/variable/override/simple
deleted file mode 100644
index 899daa2..0000000
--- a/tests/variable/override/simple
+++ /dev/null
@@ -1,3 +0,0 @@
-print $foo
-
-./:
diff --git a/tests/variable/override/test.sh b/tests/variable/override/test.sh
deleted file mode 100755
index a8b08b2..0000000
--- a/tests/variable/override/test.sh
+++ /dev/null
@@ -1,312 +0,0 @@
-#! /usr/bin/env bash
-
-verbose=n
-
-# By default when MSYS2 executable (bash.exe in particular) runs another
-# executable it converts arguments that look like POSIX paths to Windows
-# representations. More about it at:
-#
-# http://www.mingw.org/wiki/Posix_path_conversion
-#
-# So when you run b /v=X, build2 gets 'C:/msys64/v=X' argument instead of
-# '/v=X'. To disable this behavior set MSYS2_ARG_CONV_EXCL environment
-# variable, so all arguments starting with / will not be converted. You can
-# list more prefixes using ';' as a separator.
-#
-export MSYS2_ARG_CONV_EXCL=/
-
-tmp_file=`mktemp`
-
-# Remove temporary file on exit. Cover the case when exit due to an error.
-#
-trap 'rm -f $tmp_file' EXIT
-
-function error () { echo "$*" 1>&2; exit 1; }
-
-function fail ()
-{
-  if [ "$verbose" = "y" ]; then
-    b $*
-  else
-    b -q $* 2>/dev/null
-  fi
-
-  if [ $? -eq 0 ]; then
-    error "succeeded: b $*"
-  fi
-
-  return 0
-}
-
-function test ()
-{
-  b -q $* >$tmp_file
-
-  if [ $? -ne 0 ]; then
-    error "failed: b -q $* >$tmp_file"
-  fi
-
-  diff --strip-trailing-cr -u - $tmp_file
-
-  if [ $? -ne 0 ]; then
-    error "failed: b $*"
-  fi
-}
-
-fail foo=bar[]             # error: unexpected [ in variable assignment 'foo=bar[]'
-fail foo=[string]bar       # error: typed override of variable foo
-fail "!foo=bar" "!foo=BAR" # error: multiple global overrides of variable foo
-fail "foo=bar" "foo=BAR"   # error: multiple project overrides of variable foo
-fail "%foo=bar" "%foo=BAR" # error: multiple project overrides of variable foo
-
-test --buildfile simple foo=bar ./ ./ <<< "bar"  # Multiple bootstraps of the same project.
-
-# Visibility/qualification.
-#
-test !v=X <<EOF
-/     : X
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test v=X <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test ./:v=X <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test ./p/:v=X <<EOF
-/     :
-.     :
-d     :
-d/t   :
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test v=X --buildfile loader ./p/ <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test /v=X <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test v=X p_a=as <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test %v=X <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test %v=X p_a=as <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : x
-p/d   : x
-p/d/t : x
-EOF
-
-test /v=X d_a=as p_d_a=as <<EOF
-/     :
-.     : X
-d     : x
-d/t   : x
-p     : X
-p/d   : x
-p/d/t : x
-EOF
-
-test %v+=S %v=+P a=as <<EOF
-/     :
-.     : P x S
-d     : P x S
-d/t   : P x S
-p     : P x S
-p/d   : P x S
-p/d/t : P x S
-EOF
-
-test %v+=S %v=+P a=as p_a=as <<EOF
-/     :
-.     : P x S
-d     : P x S
-d/t   : P x S
-p     : x
-p/d   : x
-p/d/t : x
-EOF
-
-# Append/Prepend in override.
-#
-test v+=S <<EOF
-/     :
-.     : S
-d     : S
-d/t   : S
-p     : S
-p/d   : S
-p/d/t : S
-EOF
-
-test v+=S a=as <<EOF
-/     :
-.     : x S
-d     : x S
-d/t   : x S
-p     : x S
-p/d   : x S
-p/d/t : x S
-EOF
-
-test %v=+P a=as p_a=as <<EOF
-/     :
-.     : P x
-d     : P x
-d/t   : P x
-p     : x
-p/d   : x
-p/d/t : x
-EOF
-
-test %v+=S v=+P a=as p_a=as <<EOF
-/     :
-.     : P x S
-d     : P x S
-d/t   : P x S
-p     : P x
-p/d   : P x
-p/d/t : P x
-EOF
-
-# Append/Prepend in both.
-#
-test v=X a=ap d_a=ap p_a=ap p_d_a=ap <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : X
-p/d   : X
-p/d/t : X
-EOF
-
-test v+=S v=+P a=as d_a=ap d_t_a=ap p_a=ap p_d_a=ap p_d_t_a=ap <<EOF
-/     :
-.     : P x S
-d     : P x s S
-d/t   : P x s s S
-p     : P x s S
-p/d   : P x s s S
-p/d/t : P x s s s S
-EOF
-
-# These ones are surprising. I guess the moral is we shouldn't do "blind"
-# cross-project append/prepend.
-#
-test %v=X a=as d_a=ap p_a=ap p_d_a=ap <<EOF
-/     :
-.     : X
-d     : X
-d/t   : X
-p     : x s
-p/d   : x s s
-p/d/t : x s s
-EOF
-
-test %v+=S a=as d_a=ap p_a=ap p_d_a=ap <<EOF
-/     :
-.     : x S
-d     : x s S
-d/t   : x s S
-p     : x s
-p/d   : x s s
-p/d/t : x s s
-EOF
-
-test %v+=S a=as d_a=ap p_a=ap p_d_a=ap ./ p/ <<EOF
-/     :
-.     : x S
-d     : x s S
-d/t   : x s S
-p     : x s S
-p/d   : x s s S
-p/d/t : x s s S
-EOF
-
-# Typed override.
-#
-test v+=S v=+P t=string <<EOF
-/     :
-.     : PS
-d     : PS
-d/t   : PS
-p     : PS
-p/d   : PS
-p/d/t : PS
-EOF
-
-test v+=S v=+P t=string a=as d_a=ap d_t_a=ap p_a=ap p_d_a=ap p_d_t_a=ap <<EOF
-/     :
-.     : PxS
-d     : PxsS
-d/t   : PxssS
-p     : PxsS
-p/d   : PxssS
-p/d/t : PxsssS
-EOF
-
-# Cache overwrite.
-#
-test --buildfile cache x+=01 y+=01 <<EOF
-001
-2
-0 01
-1
-EOF
diff --git a/tests/variable/prepend/buildfile b/tests/variable/prepend/buildfile
deleted file mode 100644
index 896f99d..0000000
--- a/tests/variable/prepend/buildfile
+++ /dev/null
@@ -1,14 +0,0 @@
-foo =+ FOO
-print $foo
-
-foo =+ foo
-print $foo
-
-foo = foo
-print $foo
-
-foo =+ FOO
-foo += FOO
-print $foo
-
-./:
diff --git a/tests/variable/prepend/test.out b/tests/variable/prepend/test.out
deleted file mode 100644
index 80b77d0..0000000
--- a/tests/variable/prepend/test.out
+++ /dev/null
@@ -1,4 +0,0 @@
-FOO
-foo FOO
-foo
-FOO foo FOO
diff --git a/tests/variable/prepend/test.sh b/tests/variable/prepend/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/prepend/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/qualified/buildfile b/tests/variable/qualified/buildfile
deleted file mode 100644
index 870b808..0000000
--- a/tests/variable/qualified/buildfile
+++ /dev/null
@@ -1,27 +0,0 @@
-#v = (foo:) # error: variable name expected before ':'
-#v = (:bar) # error: scope/target expected after ':'
-
-print (foo:bar)
-print (foo :bar)
-print (foo: bar)
-print (foo : bar)
-print (foo/: bar)
-print (foo/file{fox}: bar)
-
-bar=bar
-sub/:
-{
-  bar=Bar
-  fsdir{./}: bar=BAR
-  file{x}: bar=BBAARR
-}
-
-print $(./:bar)
-print $(sub/:bar)
-print $(fsdir{sub/}:bar)
-print $(sub/file{x}:bar)
-
-print $(sub/file{y}:bar)
-print $(sup/:bar)
-
-./:
diff --git a/tests/variable/qualified/test.out b/tests/variable/qualified/test.out
deleted file mode 100644
index 5bf062e..0000000
--- a/tests/variable/qualified/test.out
+++ /dev/null
@@ -1,12 +0,0 @@
-foo:bar
-foo:bar
-foo:bar
-foo:bar
-foo/:bar
-foo/file{fox}:bar
-bar
-Bar
-BAR
-BBAARR
-Bar
-bar
diff --git a/tests/variable/qualified/test.sh b/tests/variable/qualified/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/qualified/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/representation/build/bootstrap.build b/tests/variable/representation/build/bootstrap.build
deleted file mode 100644
index 6a48e2e..0000000
--- a/tests/variable/representation/build/bootstrap.build
+++ /dev/null
@@ -1,4 +0,0 @@
-project = variable-representation
-amalgamation = # Disabled.
-using config
-using test
diff --git a/tests/variable/representation/buildfile b/tests/variable/representation/buildfile
deleted file mode 100644
index b9c213d..0000000
--- a/tests/variable/representation/buildfile
+++ /dev/null
@@ -1,34 +0,0 @@
-# @@ I wonder if we can redo this test in terms of print?
-#
-
-# Test reversibility of variable representation.
-#
-val  = -L/
-val += -L/foo/
-val += ..
-val += ../
-val += /
-val += //
-val += ///
-val += //foo/
-#val += dir{-L/}
-
-# Note that this is "reversed" when we assign it to test.options
-# since that variable is of type strings.
-#
-val += foo@bar foo/@bar/ foo@ @bar @ "@@"
-
-val += foo%bar
-val += foo%
-val += %bar
-val += foo%{bar}
-#val += foo%file{x}
-
-val += x%foo@y%bar
-val += x%foo/@y%bar/
-
-using cxx
-
-exe{driver}: cxx{driver}
-exe{driver}: test.output = test.out
-exe{driver}: test.options = $val
diff --git a/tests/variable/representation/driver.cxx b/tests/variable/representation/driver.cxx
deleted file mode 100644
index ecff9e2..0000000
--- a/tests/variable/representation/driver.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <iostream>
-
-using namespace std;
-
-int
-main (int argc, const char* argv[])
-{
-  for (int i (1); i < argc; ++i)
-    cout << "'" << argv[i] << "'" << endl;
-}
diff --git a/tests/variable/representation/test.out b/tests/variable/representation/test.out
deleted file mode 100644
index 84e7250..0000000
--- a/tests/variable/representation/test.out
+++ /dev/null
@@ -1,20 +0,0 @@
-'-L/'
-'-L/foo/'
-'..'
-'../'
-'/'
-'//'
-'///'
-'//foo/'
-'foo@bar'
-'foo/@bar/'
-'foo@'
-'@bar'
-'@'
-'@@'
-'foo%bar'
-'foo%'
-'%bar'
-'foo%bar'
-'x%foo@y%bar'
-'x%foo/@y%bar/'
diff --git a/tests/variable/representation/test.sh b/tests/variable/representation/test.sh
deleted file mode 100755
index da9e0e9..0000000
--- a/tests/variable/representation/test.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-b test
-
diff --git a/tests/variable/type-pattern-append/buildfile b/tests/variable/type-pattern-append/buildfile
deleted file mode 100644
index a91b340..0000000
--- a/tests/variable/type-pattern-append/buildfile
+++ /dev/null
@@ -1,59 +0,0 @@
-# Typed append/prepend.
-#
-#dir{a*}: x += [bool] true
-#dir{p*}: x =+ [bool] true
-
-[string] typed = [null]
-dir{a*}: typed += abc    # ok
-dir{p*}: typed =+ abc    # ok
-
-# Prepend/append before/after assignment.
-#
-[string] x1 = [null]
-dir{*}: x1 += A
-dir{*}: x1 = b
-dir{*}: x1 += c
-dir{*}: x1 =+ a
-print $(dir{./}:x1)
-
-# Without stem, mixed prepend/append.
-#
-dir{*}: x2 += b
-dir{*}: x2 += c
-#dir{*}: x2 =+ a     # error
-print $(dir{./}:x2)
-
-dir{*}: x3 =+ b
-dir{*}: x3 =+ a
-#dir{*}: x3 += c     # error
-print $(dir{./}:x3)
-
-# With stem, typing.
-#
-x4 = a
-dir{*}: x4 += b
-dir{*}: x4 += c
-print $(dir{./}:x4)
-
-[string] x5 = b
-dir{*}: x5 =+ a
-x = $(dir{./}:x5)
-print $(dir{./}:x5)
-
-x6 = [string] a
-sub/:
-{
-  dir{*}: x6 += b
-  dir{*}: x6 += [null]
-  print $(dir{./}:x6)
-}
-
-x7 = [string] b
-dir{*}: x7 =+ a
-sub/:
-{
-  dir{*}: x7 += c
-  print $(dir{./}:x7)
-}
-
-./:
diff --git a/tests/variable/type-pattern-append/test.out b/tests/variable/type-pattern-append/test.out
deleted file mode 100644
index e8e2242..0000000
--- a/tests/variable/type-pattern-append/test.out
+++ /dev/null
@@ -1,7 +0,0 @@
-abc
-b c
-a b
-a b c
-ab
-ab
-abc
diff --git a/tests/variable/type-pattern-append/test.sh b/tests/variable/type-pattern-append/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/type-pattern-append/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -
diff --git a/tests/variable/type-pattern/buildfile b/tests/variable/type-pattern/buildfile
deleted file mode 100644
index dd218ac..0000000
--- a/tests/variable/type-pattern/buildfile
+++ /dev/null
@@ -1,39 +0,0 @@
-#dir/foo{*}: x = y # directory
-#foo{*.*}: x = y # multiple wildcards
-#foo{*}: x = y # unknown target type
-#file{*}: x += y # append
-
-# Use --verbose 6 to examine.
-#
-
-dir{*}: x = y
-
-x = z
-dir{*-foo}: x = $x # 'z'
-
-x = G
-file{*-foo}: x = x
-file{xfoo}: x = $x      # 'G'
-file{-foo}: x = $x      # 'x'
-file{x-foo}: x = $x     # 'x'
-file{bar-*-foo}: x = X
-file{bar-x}: x = $x     # 'G'
-file{bar--foo}: x = $x  # 'X'
-file{bar-x-foo}: x = $x # 'X'
-
-file{*-fox}: x = 1
-file{fox-*}: x = 2
-file{fox-fox}: x = $x # '2'
-file{*-fox}: x = 3
-file{fox-x-fox}: x = $x # still '2'!
-
-*-foz: x = z        # any target
-file{x-foz}: x = $x # 'z'
-
-# These should all be the same.
-#
-*: x1 = X1
-{*}: x2 = X2
-*{*}: x3 = X3
-
-./:
diff --git a/tests/variable/type/buildfile b/tests/variable/type/buildfile
deleted file mode 100644
index a22cddd..0000000
--- a/tests/variable/type/buildfile
+++ /dev/null
@@ -1,84 +0,0 @@
-# Variable typing.
-#
-
-#[string] str3 = foo
-#[bool] str3 = false       # error: changing str3 type from string to bool
-
-#[bool string] str3 = foo  # error: multiple variable types: bool, string
-
-#[junk] jnk = foo          # error: unknown variable attribute junk
-
-[string] str1 = bar
-str1 =+ foo
-str1 += baz
-print $str1
-
-str2 = bar
-[string] str2 =+ foo
-str2 += baz
-print $str2
-
-# Value typing.
-#
-
-#v = [bool string] true # error: multiple value types: string, bool
-#v = [string=junk] true # error: unexpected value for attribute string: junk
-
-#[string] var =
-#var = [bool] true # error: confliction variable var type string and value type bool
-
-#var = [string] false
-#var += [bool] true # error: confliction original value type string and append/prepend value type bool
-
-v1a = [uint64] 00
-v1b += [uint64] 00
-v1c =+ [uint64] 00
-print $v1a $v1b $v1c # 0 0 0
-
-v2 = [uint64] 00
-v2 = [string] 00
-print $v2 # 00
-
-#v3a = [uint64] 00
-#v3a += [string] 00 # error: confliction original value type uint64 and append/prepend value type string
-
-#v3b = [uint64] 00
-#v3b =+ [string] 00 # error: confliction original value type uint64 and append/prepend value type string
-
-v4a = 01
-v4a += [uint64] 01
-print $v4a # 2
-
-v4b = 01
-v4b =+ [uint64] 01
-print $v4b # 2
-
-v5a = 01
-sub/:
-{
-  v5a += [uint64] 01
-  print $v5a # 2
-}
-
-v5b = 01
-sub/:
-{
-  v5b =+ [uint64] 01
-  print $v5b # 2
-}
-
-v6 = [uint64 null]
-v6 += 00
-print $v6 # 0
-
-v7 = [string null]
-v7 += [uint64] 00
-print $v7 # 0
-
-print [uint64] 00 # 0
-
-v8 = [uint64] 01
-v8 = abc
-print $v8 # abc
-
-./:
diff --git a/tests/variable/type/test.out b/tests/variable/type/test.out
deleted file mode 100644
index 5218221..0000000
--- a/tests/variable/type/test.out
+++ /dev/null
@@ -1,12 +0,0 @@
-foobarbaz
-foobarbaz
-0 0 0
-00
-2
-2
-2
-2
-0
-0
-0
-abc
diff --git a/tests/variable/type/test.sh b/tests/variable/type/test.sh
deleted file mode 100755
index c745b76..0000000
--- a/tests/variable/type/test.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-b -q | diff --strip-trailing-cr -u test.out -