Merge remote-tracking branch 'upstream/master' into glibc-build

Author: ParthPratim

.circleci/config.yml

@@ -32,6 +32,17 @@ do_steps: &do_steps
 
         # we clone a fork of bake
         cd "$HOME" && git clone -b ${BAKE_BRANCH} git://github.com/nsnam/bake-git ./bake
+
+        # setup environment
+        OS=$(awk -F= '/^NAME/{print $2}' /etc/os-release)
+        if [[ $OS = "\"Ubuntu\"" ]] ; then 
+          sudo apt-get update; sudo apt-get install -y python-pip python3-pip ;
+        elif [[ $OS = "Fedora" ]] ; then
+          sudo yum -y update ; sudo yum install -y python-pip python3-pip;
+        fi
+
+        sudo pip install distro requests; sudo pip3 install distro requests                    
+
         cd "$HOME" && ./bake/bake.py configure -e dce-umip-${BAKE_MOD_VERSION} -e dce-linux-${BAKE_MOD_VERSION}
         cd "$HOME" && ./bake/bake.py download -vvv
 
@@ -77,64 +88,30 @@ do_steps: &do_steps
       path: ~/junit
   - store_artifacts:
       path: ~/junit
+  - store_artifacts:
       path: ~/testpy-output
 
 ## Customize the test machine
 jobs:
-  ubuntu14.04:
-   docker:
-     - image: ns3dce/ubuntu14.04:0.1
-   environment:
-   <<: *do_steps
-
   ubuntu16.04:
    docker:
      - image: ns3dce/ubuntu16.04:0.1
    environment:
    <<: *do_steps
 
-  ubuntu17.04:
-   docker:
-     - image: ns3dce/ubuntu17.04:0.1
-   environment:
-   <<: *do_steps
-
-  fedora26:
-   docker:
-     - image: ns3dce/fedora26:0.1
-   environment:
-   <<: *do_steps
-
-  fedora27:
-   docker:
-     - image: ns3dce/fedora27:0.1
-   environment:
-   <<: *do_steps
-
-  # not yet released (171228)
-  fedora28:
-   docker:
-     - image: ns3dce/fedora28:0.1
-   environment:
-   <<: *do_steps
-
 
 workflows:
   version: 2
   build:
     jobs:
-     - ubuntu14.04
      - ubuntu16.04
-     - ubuntu17.04
-     - fedora26
-     - fedora27
   nightly_workflow:
     triggers:
       - schedule:
           cron: "0 1 * * *" # run at 1am UTC
           filters:
             branches:
               only:
-                - fix-valgrind-test
+                - fix-valgrind-test    
     jobs:
-      - ubuntu14.04_valgrind
+      - ubuntu14.04_valgrind

test.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 #
 # Copyright (c) 2009 University of Washington
@@ -552,7 +552,18 @@ def sigint_hook(signal, frame):
 # and use that result.
 #
 def read_waf_config():
-    for line in open(".lock-waf_" + sys.platform + "_build", "rt"):
+    f = None
+    try:
+        # sys.platform reports linux2 for python2 and linux for python3
+        f = open(".lock-waf_" + sys.platform + "_build", "rt")
+    except FileNotFoundError:
+        try:
+            f = open(".lock-waf_linux2_build", "rt")
+        except FileNotFoundError:
+            print('The .lock-waf ... directory was not found.  You must do waf build before running test.py.', file=sys.stderr)
+            sys.exit(2)
+
+    for line in f:
         if line.startswith("top_dir ="):
             key, val = line.split('=')
             top_dir = eval(val.strip())
@@ -651,9 +662,7 @@ def make_paths():
     else:
         if not have_LD_LIBRARY_PATH:
             os.environ["LD_LIBRARY_PATH"] = ""
-        print("%r" % NS3_MODULE_PATH)
         for path in NS3_MODULE_PATH:
-            print("%r", path)
             os.environ["LD_LIBRARY_PATH"] += ":" + path
         os.environ["LD_LIBRARY_PATH"] += ":" + dce_ldlibpath
         if options.verbose: