Parcourir la source

Fixes to SCCD

Yentl Van Tendeloo il y a 8 ans
Parent
commit
29318a590b
3 fichiers modifiés avec 6 ajouts et 3 suppressions
  1. 4 2
      bootstrap/utils.alc
  2. 1 0
      kernel/modelverse_kernel/primitives.py
  3. 1 1
      scripts/run_fast_tests.py

+ 4 - 2
bootstrap/utils.alc

@@ -91,9 +91,11 @@ Void function list_extend(lst : Element, ext : Element):
 Void function set_difference(set1 : Element, set2 : Element):
 	set2 = set_copy(set2)
 
+	Element elem
 	while (set_len(set2) > 0):
-		set_remove(set1, set_pop(set2))
-
+		elem = set_pop(set2)
+		if (set_in(set1, elem)):
+			set_remove(set1, set_pop(set2))
 	return!
 
 String function get_taskname():

+ 1 - 0
kernel/modelverse_kernel/primitives.py

@@ -259,6 +259,7 @@ def dict_delete(a, b, **remainder):
         keys, = yield [("RDK", [a])]
         keys = yield [("RV", [i]) for i in keys]
         print("Keys: " + str(keys))
+        raise Exception()
     yield [("DE", [edge])]
     raise PrimitiveFinished(a)
 

+ 1 - 1
scripts/run_fast_tests.py

@@ -7,4 +7,4 @@ subprocess.check_call([sys.executable, "-m", "pytest"], cwd="kernel")
 
 subprocess.check_call([sys.executable, "-m", "pytest"], cwd="interface/HUTN")
 
-subprocess.check_call([sys.executable, "-m", "pytest", "integration"])
+subprocess.check_call([sys.executable, "-m", "pytest", "integration", "-v"])