Pull requests

#36 Merged
dirkbaechle dirkbaechle
scons scons

First swoop of changes for getting all Buildbot slaves to run successfully again

  1. dirkbaechle avatardirkbaechle


these are the first simple fixes for some of the current Buildbot problems (issue #2872). Some more updates/pull requests may follow, but I'd like to give it a shot now and see which fails are left for the next round.



Comments (3)

  1. William Deegan

    Wouldn't it be better to move these changes machine = TestSCons.machine

        # Try to get the actual machine type (like i586), since
        # TestSCons maps all ix86 types to a i386 machine internally.
        import os
        machine = os.uname()[4]
    except AttributeError:

    Into TestSCons.machine?

    1. dirkbaechle author


      I just gave this a second look. My first assumption was that the TestSCons.machine var was used in some other tests at well, but it isn't. We could probably move the code to the test framework directly, as you proposed. There is still one glitch though: RPM uses the "hardware platform" for naming its files, while uname()[4] returns the "machine hardware name". Any ideas how to get at the former one?

    2. dirkbaechle author

      I left the machine attribute where it is now, and instead added two new functions to TestCmd---can't be bad---that help in keeping the test for the created RPM files more general. Hope that's okay with everyone out there. I also corrected the Java version support and upgraded it to 1.7, now all throughout JavaCommon.py.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.