Changeset e173d3c

Timestamp:

Aug 29, 2022, 8:00:07 PM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

e2e31c6

Parents:

31b9d3c

Message:

'soft' removed old ast from tests.
Option still works but no longer has any effect.

Location:

tests

Files:

• Makefile.am (modified) (2 diffs)
• pybin/settings.py (modified) (1 diff)
• test.py (modified) (1 diff)

tests/Makefile.am

@@ -54 +54 @@
 
 # adjust CC to current flags
-CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
+CC = LC_ALL=C $(if $(DISTCC_CFA_PATH),distcc $(DISTCC_CFA_PATH) ${ARCH_FLAGS} ,$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS}
 CFACC = $(CC)
 
@@ -61 +61 @@
 
 # adjusted CC but without the actual distcc call
-CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS} ${AST_FLAGS},$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS} ${AST_FLAGS})
+CFACCLOCAL = $(if $(DISTCC_CFA_PATH),$(DISTCC_CFA_PATH) ${ARCH_FLAGS} ,$(TARGET_CFA) ${DEBUG_FLAGS} ${ARCH_FLAGS})
 CFACCLINK = $(CFACCLOCAL) -quiet $(if $(test), 2> $(test), ) $($(shell echo "${@}_FLAGSLD" | sed 's/-\|\//_/g'))
 

tests/pybin/settings.py

@@ -102 +102 @@
                         self.target = ast
                         self.string = "New AST"
-                        self.flags  = """AST_FLAGS=-XCFA,--new-ast"""
+                        self.flags  = """"""
                 elif ast == "old":
                         self.target = ast
                         self.string = "Old AST"
-                        self.flags  = """AST_FLAGS=-XCFA,--old-ast"""
+                        self.flags  = """"""
                 elif ast == None:
                         self.target = "new" if config.NEWAST else "old"
                         self.string = "Default AST (%s)" % self.target
-                        self.flags  = """AST_FLAGS="""
+                        self.flags  = """"""
                 else:
                         print("""ERROR: Invalid ast configuration, must be "old", "new" or left unspecified, was %s""" % (value), file=sys.stderr)

tests/test.py

@@ -351 +351 @@
 
                 # print the possible options
-                print("-h --help --debug --dry-run --list --ast=new --ast=old --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout --timeout-with-gdb -j --jobs -I --include -E --exclude --continue ", end='')
+                print("-h --help --debug --dry-run --list --arch --all --regenerate-expected --archive-errors --install --timeout --global-timeout --timeout-with-gdb -j --jobs -I --include -E --exclude --continue ", end='')
                 print(" ".join(map(lambda t: "%s" % (t.target()), tests)))