Remove problematic tests, deal with this issue outside of PR #869.
This commit is contained in:
		@@ -1,31 +0,0 @@
 | 
				
			|||||||
#!/bin/bash
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# This will install a few bogus/test packages in order to test the
 | 
					 | 
				
			||||||
# `spack view` command.  It assumes you have "spack" in your path.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# It makes sub-directories in your CWD and installs and uninstalls
 | 
					 | 
				
			||||||
# Spack packages named test-*.
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
set -x
 | 
					 | 
				
			||||||
set -e
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
view="spack -m view -v"
 | 
					 | 
				
			||||||
for variant in +nom ~nom+var +nom+var
 | 
					 | 
				
			||||||
do
 | 
					 | 
				
			||||||
    spack -m uninstall -f -a -y test-d
 | 
					 | 
				
			||||||
    spack -m install test-d$variant
 | 
					 | 
				
			||||||
    testdir=test_view
 | 
					 | 
				
			||||||
    rm -rf $testdir
 | 
					 | 
				
			||||||
    echo "hardlink may fail if Spack install area and CWD are not same FS"
 | 
					 | 
				
			||||||
    for action in symlink hardlink
 | 
					 | 
				
			||||||
    do
 | 
					 | 
				
			||||||
	$view --dependencies=no   $action $testdir test-d
 | 
					 | 
				
			||||||
	$view -e test-a -e test-b $action $testdir test-d
 | 
					 | 
				
			||||||
	$view                     $action $testdir test-d
 | 
					 | 
				
			||||||
	$view                     status  $testdir test-d
 | 
					 | 
				
			||||||
	$view -d false            remove  $testdir test-a
 | 
					 | 
				
			||||||
	$view                     remove  $testdir test-d
 | 
					 | 
				
			||||||
	rmdir $testdir		# should not fail
 | 
					 | 
				
			||||||
    done
 | 
					 | 
				
			||||||
done
 | 
					 | 
				
			||||||
echo "Warnings about skipping existing in the above are okay"
 | 
					 | 
				
			||||||
@@ -1,30 +0,0 @@
 | 
				
			|||||||
from spack import *
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
mydir = os.path.dirname(__file__)
 | 
					 | 
				
			||||||
source = os.path.join(mydir,'test-a-0.0.tar.gz')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class TestA(Package):
 | 
					 | 
				
			||||||
    """The test-a package"""
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    url = 'file://'+source
 | 
					 | 
				
			||||||
    homepage = "http://www.example.com/"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    version('0.0', '4e823d0af4154fcf52b75dad41b7fd63')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    variant('nom', default=True, description='Nominal variant')
 | 
					 | 
				
			||||||
    variant('var', default=False, description='Variant variant')
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
    def install(self, spec, prefix):
 | 
					 | 
				
			||||||
        bindir = os.path.join(prefix,'bin')
 | 
					 | 
				
			||||||
        os.makedirs(bindir)
 | 
					 | 
				
			||||||
        script = os.path.join(bindir, 'test-a')
 | 
					 | 
				
			||||||
        with open(script,'w') as fp:
 | 
					 | 
				
			||||||
            fp.write("""#!/bin/bash
 | 
					 | 
				
			||||||
echo 'name: %s'
 | 
					 | 
				
			||||||
echo 'prefix: %s'
 | 
					 | 
				
			||||||
echo 'spec: %s'
 | 
					 | 
				
			||||||
            """ % (spec.name, prefix, spec))
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        os.chmod(script, 0555)
 | 
					 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							@@ -1,32 +0,0 @@
 | 
				
			|||||||
from spack import *
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
mydir = os.path.dirname(__file__)
 | 
					 | 
				
			||||||
source = os.path.join(mydir,'test-b-0.0.tar.gz')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class TestB(Package):
 | 
					 | 
				
			||||||
    """The test-b package"""
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    url = 'file://'+source
 | 
					 | 
				
			||||||
    homepage = "http://www.example.com/"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    version('0.0', '4e823d0af4154fcf52b75dad41b7fd63')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    variant('nom', default=True, description='Nominal variant')
 | 
					 | 
				
			||||||
    variant('var', default=False, description='Variant variant')
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
    depends_on('test-a')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    def install(self, spec, prefix):
 | 
					 | 
				
			||||||
        bindir = os.path.join(prefix,'bin')
 | 
					 | 
				
			||||||
        os.makedirs(bindir)
 | 
					 | 
				
			||||||
        script = os.path.join(bindir, 'test-b')
 | 
					 | 
				
			||||||
        with open(script,'w') as fp:
 | 
					 | 
				
			||||||
            fp.write("""#!/bin/bash
 | 
					 | 
				
			||||||
echo 'name: %s'
 | 
					 | 
				
			||||||
echo 'prefix: %s'
 | 
					 | 
				
			||||||
echo 'spec: %s'
 | 
					 | 
				
			||||||
            """ % (spec.name, prefix, spec))
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        os.chmod(script, 0555)
 | 
					 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							@@ -1,32 +0,0 @@
 | 
				
			|||||||
from spack import *
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
mydir = os.path.dirname(__file__)
 | 
					 | 
				
			||||||
source = os.path.join(mydir,'test-c-0.0.tar.gz')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class TestC(Package):
 | 
					 | 
				
			||||||
    """The test-c package"""
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    url = 'file://'+source
 | 
					 | 
				
			||||||
    homepage = "http://www.example.com/"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    version('0.0', '4e823d0af4154fcf52b75dad41b7fd63')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    variant('nom', default=True, description='Nominal variant')
 | 
					 | 
				
			||||||
    variant('var', default=False, description='Variant variant')
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
    depends_on('test-a+var',when='+var')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    def install(self, spec, prefix):
 | 
					 | 
				
			||||||
        bindir = os.path.join(prefix,'bin')
 | 
					 | 
				
			||||||
        os.makedirs(bindir)
 | 
					 | 
				
			||||||
        script = os.path.join(bindir, 'test-c')
 | 
					 | 
				
			||||||
        with open(script,'w') as fp:
 | 
					 | 
				
			||||||
            fp.write("""#!/bin/bash
 | 
					 | 
				
			||||||
echo 'name: %s'
 | 
					 | 
				
			||||||
echo 'prefix: %s'
 | 
					 | 
				
			||||||
echo 'spec: %s'
 | 
					 | 
				
			||||||
            """ % (spec.name, prefix, spec))
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        os.chmod(script, 0555)
 | 
					 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							@@ -1,33 +0,0 @@
 | 
				
			|||||||
from spack import *
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
import os
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
mydir = os.path.dirname(__file__)
 | 
					 | 
				
			||||||
source = os.path.join(mydir,'test-d-0.0.tar.gz')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
class TestD(Package):
 | 
					 | 
				
			||||||
    """The test-d package"""
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    url = 'file://'+source
 | 
					 | 
				
			||||||
    homepage = "http://www.example.com/"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    version('0.0', '4e823d0af4154fcf52b75dad41b7fd63')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    variant('nom', default=True, description='Nominal variant')
 | 
					 | 
				
			||||||
    variant('var', default=False, description='Variant variant')
 | 
					 | 
				
			||||||
  
 | 
					 | 
				
			||||||
    depends_on('test-b')
 | 
					 | 
				
			||||||
    depends_on('test-c')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    def install(self, spec, prefix):
 | 
					 | 
				
			||||||
        bindir = os.path.join(prefix,'bin')
 | 
					 | 
				
			||||||
        os.makedirs(bindir)
 | 
					 | 
				
			||||||
        script = os.path.join(bindir, 'test-d')
 | 
					 | 
				
			||||||
        with open(script,'w') as fp:
 | 
					 | 
				
			||||||
            fp.write("""#!/bin/bash
 | 
					 | 
				
			||||||
echo 'name: %s'
 | 
					 | 
				
			||||||
echo 'prefix: %s'
 | 
					 | 
				
			||||||
echo 'spec: %s'
 | 
					 | 
				
			||||||
            """ % (spec.name, prefix, spec))
 | 
					 | 
				
			||||||
        
 | 
					 | 
				
			||||||
        os.chmod(script, 0555)
 | 
					 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user