8 files changed, 0 insertions, 104 deletions
diff --git a/tests/scope/amalgamation/build/bootstrap.build b/tests/scope/amalgamation/build/bootstrap.build
deleted file mode 100644
index ee73365..0000000
--- a/tests/scope/amalgamation/build/bootstrap.build
+++ /dev/null
@@ -1,3 +0,0 @@
-project = scope-amalgamation
-amalgamation = # Disabled.
-using config
diff --git a/tests/scope/amalgamation/buildfile b/tests/scope/amalgamation/buildfile
deleted file mode 100644
index 9f80de9..0000000
--- a/tests/scope/amalgamation/buildfile
+++ /dev/null
@@ -1 +0,0 @@
-./:
diff --git a/tests/scope/amalgamation/l1/build/bootstrap.build b/tests/scope/amalgamation/l1/build/bootstrap.build
deleted file mode 100644
index 6bde838..0000000
--- a/tests/scope/amalgamation/l1/build/bootstrap.build
+++ /dev/null
@@ -1,16 +0,0 @@
-project = scope-amalgamation-l1
-using config
-
-# At this stage we don't know ../ is a project. This
-# tests an out-of-project scope that will later be
-# replaced with an in-project scope. Note that the
-# replacement will only occur if src_root != out_root.
-# If they are the same, then this scope will simply
-# be "upgraded".
-#
-$src_root/../:
-{
-  print 0: $project
-  print 0: $src_base
-  print 0: $out_base
-}
diff --git a/tests/scope/amalgamation/l1/buildfile b/tests/scope/amalgamation/l1/buildfile
deleted file mode 100644
index 55d8c64..0000000
--- a/tests/scope/amalgamation/l1/buildfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Out of amalgamation.
-#
-../../:
-{
-  print -1: $project
-  print -1: $src_base
-  print -1: $out_base
-}
-
-# In amalgamation.
-#
-../s/:
-{
-  print 0: $project
-  print 0: $src_base
-  print 0: $out_base
-}
-
-# In project.
-#
-s/:
-{
-  print 1: $project
-  print 1: $src_base
-  print 1: $out_base
-}
-
-# In sub-project.
-#
-l2/s/:
-{
-  print 2: $project
-  print 2: $src_base
-  print 2: $out_base
-}
-
-./:
diff --git a/tests/scope/amalgamation/l1/l2/build/bootstrap.build b/tests/scope/amalgamation/l1/l2/build/bootstrap.build
deleted file mode 100644
index 0262763..0000000
--- a/tests/scope/amalgamation/l1/l2/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = scope-amalgamation-l2
-using config
diff --git a/tests/scope/test-1.out b/tests/scope/test-1.out
deleted file mode 100644
index 0273bf1..0000000
--- a/tests/scope/test-1.out
+++ /dev/null
@@ -1,15 +0,0 @@
-0:
-0:
-0:
--1:
--1:
--1:
-0: scope-amalgamation
-0: /home/boris/work/build2/build2/tests/scope/amalgamation/s/
-0: /home/boris/work/build2/build2/tests/scope/amalgamation/s/
-1: scope-amalgamation-l1
-1: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/s/
-1: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/s/
-2: scope-amalgamation-l2
-2: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/l2/s/
-2: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/l2/s/
diff --git a/tests/scope/test-2.out b/tests/scope/test-2.out
deleted file mode 100644
index 88f9620..0000000
--- a/tests/scope/test-2.out
+++ /dev/null
@@ -1,15 +0,0 @@
-0:
-0:
-0:
--1:
--1:
--1:
-0: scope-amalgamation
-0: /home/boris/work/build2/build2/tests/scope/amalgamation/s/
-0: /home/boris/work/build2/build2/tests/scope/a-out/s/
-1: scope-amalgamation-l1
-1: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/s/
-1: /home/boris/work/build2/build2/tests/scope/a-out/l1/s/
-2: scope-amalgamation-l2
-2: /home/boris/work/build2/build2/tests/scope/amalgamation/l1/l2/s/
-2: /home/boris/work/build2/build2/tests/scope/a-out/l1/l2/s/
diff --git a/tests/scope/test.sh b/tests/scope/test.sh
deleted file mode 100755
index 2728a9d..0000000
--- a/tests/scope/test.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# In-tree.
-#
-b amalgamation/l1/ 2>/dev/null | diff --strip-trailing-cr -u test-1.out -
-
-# Out-of-tree.
-#
-rm -rf a-out/
-b 'configure(amalgamation/@a-out/)' 2>/dev/null
-
-b amalgamation/l1/@a-out/l1/ 2>/dev/null | \
-  diff --strip-trailing-cr -u test-2.out -
-
-rm -rf a-out/