diff options
| -rw-r--r-- | sim/pyconfig/m5config.py | 24 | ||||
| -rw-r--r-- | test/genini.py | 5 |
2 files changed, 3 insertions, 26 deletions
diff --git a/sim/pyconfig/m5config.py b/sim/pyconfig/m5config.py index 39c2be7ab..d7c0c6507 100644 --- a/sim/pyconfig/m5config.py +++ b/sim/pyconfig/m5config.py @@ -46,30 +46,6 @@ class Singleton(type): cls._instance = super(Singleton, cls).__call__(*args, **kwargs) return cls._instance -#class MetaTempObject(type): -# classes = {} -# def __new__(mcls, name, bases, dict): -# _bases = [] -# for base in bases: -# if base.__name__ is 'TempObject': -# _bases.append('SimObject') -# else: -# _bases.append(base.__name__) -# newdict = { '_bases' : _bases, '_name' : name, '_params' : dict } -# cls = type.__new__(mcls, name, bases, newdict) -# mcls.classes[name] = cls -# return cls -# -#class TempObject(object): -# __metaclass__ = MetaTempObject - -def defined(s): - try: - eval(s) - return True - except NameError: - return False - if os.environ.has_key('FULL_SYSTEM'): FULL_SYSTEM = True diff --git a/test/genini.py b/test/genini.py index bad173365..e96d7069c 100644 --- a/test/genini.py +++ b/test/genini.py @@ -25,13 +25,13 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import getopt, os, sys +import getopt, os, os.path, sys sys.path.append('..') sys.path.append('../configs/kernel') sys.path.append('../sim/pyconfig') -from importer import mpy_exec +from importer import mpy_exec, AddToPath from m5config import * try: @@ -50,6 +50,7 @@ except getopt.GetoptError: sys.exit('Improper Usage') for arg in args: + AddToPath(os.path.dirname(arg)) mpy_exec(file(arg, 'r'), globals()) if globals().has_key('root') and isinstance(root, type) \ |